diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 17:44:18 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 17:44:18 -0400 |
| commit | 43872fa788060eef91ae437957e0a5e39f1c56fd (patch) | |
| tree | dba464da61167d84b4f7470edebd5a769a78f9ee /arch/arm/mach-at91/board-sam9260ek.c | |
| parent | 91fed558d0f33c74477569f50ed883fe6d430f1f (diff) | |
| parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
Merge branch 'depends/rmk/gpio' into next/fixes
This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/board-sam9260ek.c')
| -rw-r--r-- | arch/arm/mach-at91/board-sam9260ek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c index 8a50c3e67186..89c8b579bfda 100644 --- a/arch/arm/mach-at91/board-sam9260ek.c +++ b/arch/arm/mach-at91/board-sam9260ek.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 23 | #include <linux/gpio.h> | ||
| 23 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 24 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
| 25 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| @@ -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 | #include <mach/system_rev.h> | 47 | #include <mach/system_rev.h> |