diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-21 10:46:26 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-21 10:46:26 -0400 |
| commit | 335332770c68649ffeaf5dc2b58d9cd40041e295 (patch) | |
| tree | a48e86b9f9a80913399a182a152b4c580a9c3836 /arch/arm/mach-at91/board-usb-a926x.c | |
| parent | 3b3c281073288ebdc6161108bdc4c9f1b08bdee3 (diff) | |
| parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
Merge branch 'depends/rmk/gpio' into next/board
Conflicts:
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-at91/board-usb-a9263.c
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
Diffstat (limited to 'arch/arm/mach-at91/board-usb-a926x.c')
| -rw-r--r-- | arch/arm/mach-at91/board-usb-a926x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c index 260260b81992..5852d3d9890c 100644 --- a/arch/arm/mach-at91/board-usb-a926x.c +++ b/arch/arm/mach-at91/board-usb-a926x.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
| 29 | #include <linux/spi/spi.h> | 29 | #include <linux/spi/spi.h> |
| 30 | #include <linux/gpio_keys.h> | 30 | #include <linux/gpio_keys.h> |
| 31 | #include <linux/gpio.h> | ||
| 31 | #include <linux/input.h> | 32 | #include <linux/input.h> |
| 32 | #include <linux/spi/mmc_spi.h> | 33 | #include <linux/spi/mmc_spi.h> |
| 33 | 34 | ||
| @@ -41,7 +42,6 @@ | |||
| 41 | 42 | ||
| 42 | #include <mach/hardware.h> | 43 | #include <mach/hardware.h> |
| 43 | #include <mach/board.h> | 44 | #include <mach/board.h> |
| 44 | #include <mach/gpio.h> | ||
| 45 | #include <mach/at91sam9_smc.h> | 45 | #include <mach/at91sam9_smc.h> |
| 46 | #include <mach/at91_shdwc.h> | 46 | #include <mach/at91_shdwc.h> |
| 47 | 47 | ||