diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-14 11:31:35 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-27 14:33:36 +0100 |
| commit | 818956e0b68f35ef56e9361d0fdea5d935e3827a (patch) | |
| tree | a029fe1c1a1573df5f35f3620829f3ff2a67170b /arch/arm/mach-mx5/board-mx51_3ds.c | |
| parent | 27d2d62b8b03c9dd2de9a367c19812e089da71c5 (diff) | |
| download | kernel_samsung_smdk4412-818956e0b68f35ef56e9361d0fdea5d935e3827a.zip kernel_samsung_smdk4412-818956e0b68f35ef56e9361d0fdea5d935e3827a.tar.gz kernel_samsung_smdk4412-818956e0b68f35ef56e9361d0fdea5d935e3827a.tar.bz2 | |
ARM i.MX51 mx51-3ds: remove unnecessary CONFIG_KEYBOARD_IMX ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx5/board-mx51_3ds.c')
| -rw-r--r-- | arch/arm/mach-mx5/board-mx51_3ds.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/mach-mx5/board-mx51_3ds.c b/arch/arm/mach-mx5/board-mx51_3ds.c index 2f5acd0..55d5746 100644 --- a/arch/arm/mach-mx5/board-mx51_3ds.c +++ b/arch/arm/mach-mx5/board-mx51_3ds.c @@ -75,7 +75,6 @@ static const struct imxuart_platform_data uart_pdata __initconst = { .flags = IMXUART_HAVE_RTSCTS, }; -#if defined(CONFIG_KEYBOARD_IMX) || defined(CONFIG_KEYBOARD_IMX_MODULE) static int mx51_3ds_board_keymap[] = { KEY(0, 0, KEY_1), KEY(0, 1, KEY_2), @@ -111,16 +110,6 @@ static const struct matrix_keymap_data mx51_3ds_map_data __initconst = { .keymap_size = ARRAY_SIZE(mx51_3ds_board_keymap), }; -static void mxc_init_keypad(void) -{ - imx51_add_imx_keypad(&mx51_3ds_map_data); -} -#else -static inline void mxc_init_keypad(void) -{ -} -#endif - static int mx51_3ds_spi2_cs[] = { MXC_SPI_CS(0), MX51_3DS_ECSPI2_CS, @@ -162,7 +151,7 @@ static void __init mxc_board_init(void) "devices on the board are unusable.\n"); imx51_add_sdhci_esdhc_imx(0, NULL); - mxc_init_keypad(); + imx51_add_imx_keypad(&mx51_3ds_map_data); imx51_add_imx2_wdt(0, NULL); } |