diff options
| author | Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> | 2009-10-22 17:43:17 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-10-22 17:43:17 -0400 |
| commit | 6135434a54719c45fdc6add1ba4965dea89ab069 (patch) | |
| tree | 08e437c116f72edf494593d73f56f5da78b1dfab /arch/arm/mach-omap2/board-rx51.c | |
| parent | 012abeea669ea49636cf952d13298bb68654146a (diff) | |
omap: Fix omap-keypad by restoring old keypad.h without breaking omap2 boards that use matrix_keypad
Only mach-omap2 boards are currently using matrix_keypad. Allow
mach-omap1 boards to use the old style keypad.h without breaking.
Created against linux-2.6.32-rc5.
Compile tested with omap_3430sdp_defconfig and rx51_defconfig.
Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index f9196c3b1a7b..78869a9a1cc2 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <mach/mux.h> | 26 | #include <mach/mux.h> |
| 27 | #include <mach/board.h> | 27 | #include <mach/board.h> |
| 28 | #include <mach/common.h> | 28 | #include <mach/common.h> |
| 29 | #include <mach/keypad.h> | ||
| 30 | #include <mach/dma.h> | 29 | #include <mach/dma.h> |
| 31 | #include <mach/gpmc.h> | 30 | #include <mach/gpmc.h> |
| 32 | #include <mach/usb.h> | 31 | #include <mach/usb.h> |