diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-10 09:15:30 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-10 09:15:30 -0800 |
| commit | c454f813501b94cd687bf3c5c0783f815a854905 (patch) | |
| tree | 8b6e1719ba4470e478d719ca0cf935501370e237 /arch/arm/mach-pxa/saarb.c | |
| parent | 1ad4fb2f7cbc21db9cdbb53e25ce348d93bbd6e7 (diff) | |
| parent | 63fc5f3bb3d0ca9ab4767a801b518aa6335f87ad (diff) | |
Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
* 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP: add minimal support for Nokia RM-696
ARM: OMAP: enable Bluetooth on the PandaBoard
ARM: OMAP: pandora: add support for backlight and poweroff
ARM: OMAP4: board-4430sdp: don't initialize value that is never used
ARM: OMAP3: cm-t3517: add EMAC support
ARM: OMAP: move generic EMAC init to separate file
ARM: OMAP3: RX-51: add explicit mux configuration of tsc2005 control gpios
ARM: OMAP: Add omap_reserve functionality
(includes sync-up to 3.3-rc6)
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> |