diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-03-12 16:41:28 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-03-12 16:41:28 +0100 |
| commit | e2aa4177264c1a459779d6e35fae22adf17a9232 (patch) | |
| tree | beba4b40aa90f6f033eb261cf5a5453c5957c87c /arch/arm/mach-pxa/saarb.c | |
| parent | gpio/omap: Fix IRQ handling for SPARSE_IRQ (diff) | |
| parent | Linux 3.3-rc7 (diff) | |
| download | linux-e2aa4177264c1a459779d6e35fae22adf17a9232.tar.xz linux-e2aa4177264c1a459779d6e35fae22adf17a9232.zip | |
Merge tag 'v3.3-rc7' into gpio/next
Linux 3.3-rc7. Merged into the gpio branch to pick up gpio bugfixes already
in mainline before queueing up move v3.4 patches
Diffstat (limited to 'arch/arm/mach-pxa/saarb.c')
| -rw-r--r-- | arch/arm/mach-pxa/saarb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/saarb.c b/arch/arm/mach-pxa/saarb.c index febc809ed5a6..5aded5e6148f 100644 --- a/arch/arm/mach-pxa/saarb.c +++ b/arch/arm/mach-pxa/saarb.c @@ -15,7 +15,6 @@ #include <linux/i2c.h> #include <linux/i2c/pxa-i2c.h> #include <linux/mfd/88pm860x.h> -#include <linux/gpio.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> |