diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-10 09:58:56 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-17 10:01:32 +0100 |
| commit | 3f880141b8d12cdbb5faf0b9941ee50ac515ea1e (patch) | |
| tree | ad50ed7f31b47c4375d48df0a4c54e655423adc1 /arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | |
| parent | ARM: imx: dynamically allocate fsl-usb2-udc devices (diff) | |
| download | linux-3f880141b8d12cdbb5faf0b9941ee50ac515ea1e.tar.xz linux-3f880141b8d12cdbb5faf0b9941ee50ac515ea1e.zip | |
ARM: imx: dynamically allocate imx-keypad devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/eukrea_mbimx27-baseboard.c')
| -rw-r--r-- | arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c index fa5aaded7c2e..3aaa3b9b604c 100644 --- a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c @@ -26,7 +26,6 @@ #include <linux/spi/ads7846.h> #include <linux/backlight.h> #include <video/platform_lcd.h> -#include <linux/input/matrix_keypad.h> #include <asm/mach/arch.h> @@ -109,7 +108,8 @@ static const uint32_t eukrea_mbimx27_keymap[] = { KEY(1, 1, KEY_LEFT), }; -static struct matrix_keymap_data eukrea_mbimx27_keymap_data = { +static const struct matrix_keymap_data +eukrea_mbimx27_keymap_data __initconst = { .keymap = eukrea_mbimx27_keymap, .keymap_size = ARRAY_SIZE(eukrea_mbimx27_keymap), }; @@ -384,7 +384,7 @@ void __init eukrea_mbimx27_baseboard_init(void) gpio_request(GPIO_PORTA | 25, "lcd_enable"); platform_device_register(&eukrea_mbimx27_lcd_powerdev); - mxc_register_device(&imx_kpp_device, &eukrea_mbimx27_keymap_data); + imx27_add_imx_keypad(&eukrea_mbimx27_keymap_data); platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); } |