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-ep93xx/core.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-ep93xx/core.c')
| -rw-r--r-- | arch/arm/mach-ep93xx/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index c60f081e930..94c78bc6627 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <mach/fb.h> | 38 | #include <mach/fb.h> |
| 39 | #include <mach/ep93xx_keypad.h> | 39 | #include <mach/ep93xx_keypad.h> |
| 40 | #include <mach/ep93xx_spi.h> | 40 | #include <mach/ep93xx_spi.h> |
| 41 | #include <mach/gpio-ep93xx.h> | ||
| 41 | 42 | ||
| 42 | #include <asm/mach/map.h> | 43 | #include <asm/mach/map.h> |
| 43 | #include <asm/mach/time.h> | 44 | #include <asm/mach/time.h> |