diff options
| author |   Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> | 2009-10-22 14:43:17 -0700 |
|---|---|---|
| committer |   Tony Lindgren <tony@atomide.com> | 2009-10-22 14:43:17 -0700 |
| commit | 6135434a54719c45fdc6add1ba4965dea89ab069 (patch) | |
| tree | 08e437c116f72edf494593d73f56f5da78b1dfab /arch/arm/mach-omap2/board-rx51-peripherals.c | |
| parent | Linux 2.6.32-rc5 (diff) | |
| download | linux-dev-6135434a54719c45fdc6add1ba4965dea89ab069.tar.xz linux-dev-6135434a54719c45fdc6add1ba4965dea89ab069.zip | |
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-peripherals.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 2b0eb1ba5d7f..e34d96a825e3 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -12,6 +12,7 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/input.h> +#include <linux/input/matrix_keypad.h> #include <linux/spi/spi.h> #include <linux/i2c.h> #include <linux/i2c/twl4030.h> @@ -27,7 +28,6 @@ #include <mach/common.h> #include <mach/dma.h> #include <mach/gpmc.h> -#include <mach/keypad.h> #include <mach/onenand.h> #include <mach/gpmc-smc91x.h> |