diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:46:42 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:46:42 -0400 |
| commit | efa62e1355f0495f37f1296754b8880947c8da72 (patch) | |
| tree | c07af29f8baf2e6f4ed3bedbe46d405924edd530 /arch/arm/mach-at91/at91sam9g45_devices.c | |
| parent | 107532920226a37e595697959b2a6a823cfa2497 (diff) | |
| parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
Merge branch 'depends/rmk/gpio' into next/devel
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9g45_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9g45_devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index e4a98574893d..b1e43ad2ccf7 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <asm/mach/map.h> | 13 | #include <asm/mach/map.h> |
| 14 | 14 | ||
| 15 | #include <linux/dma-mapping.h> | 15 | #include <linux/dma-mapping.h> |
| 16 | #include <linux/gpio.h> | ||
| 16 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 17 | #include <linux/i2c-gpio.h> | 18 | #include <linux/i2c-gpio.h> |
| 18 | #include <linux/atmel-mci.h> | 19 | #include <linux/atmel-mci.h> |
| @@ -21,7 +22,6 @@ | |||
| 21 | #include <video/atmel_lcdc.h> | 22 | #include <video/atmel_lcdc.h> |
| 22 | 23 | ||
| 23 | #include <mach/board.h> | 24 | #include <mach/board.h> |
| 24 | #include <mach/gpio.h> | ||
| 25 | #include <mach/at91sam9g45.h> | 25 | #include <mach/at91sam9g45.h> |
| 26 | #include <mach/at91sam9g45_matrix.h> | 26 | #include <mach/at91sam9g45_matrix.h> |
| 27 | #include <mach/at91sam9_smc.h> | 27 | #include <mach/at91sam9_smc.h> |