diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-14 12:12:42 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-14 12:12:42 +0000 |
| commit | 0a831cec1b627d2f3f60c6f70a4c649b7caa4fe2 (patch) | |
| tree | c2ab5e6d5ff4def2ffafe2cd61ac14aedb5a86e7 /arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | |
| parent | 5b88128fd70dcf0d5d7c0ae7d7849777ff925bde (diff) | |
| parent | b9214b9780d6897a6892e7c8cc903168d6fef097 (diff) | |
| download | talos-obmc-linux-0a831cec1b627d2f3f60c6f70a4c649b7caa4fe2.tar.gz talos-obmc-linux-0a831cec1b627d2f3f60c6f70a4c649b7caa4fe2.zip | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c')
| -rw-r--r-- | arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c b/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c index c96d018ff8a2..e83ffadb65f8 100644 --- a/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c +++ b/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c @@ -21,7 +21,6 @@ #include <linux/fsl_devices.h> #include <linux/i2c/tsc2007.h> #include <linux/leds.h> -#include <linux/input/matrix_keypad.h> #include <mach/common.h> #include <mach/hardware.h> @@ -157,7 +156,7 @@ static int mbimx51_keymap[] = { KEY(3, 3, KEY_ENTER), }; -static struct matrix_keymap_data mbimx51_map_data = { +static const struct matrix_keymap_data mbimx51_map_data __initconst = { .keymap = mbimx51_keymap, .keymap_size = ARRAY_SIZE(mbimx51_keymap), }; @@ -209,7 +208,7 @@ void __init eukrea_mbimx51_baseboard_init(void) platform_add_devices(devices, ARRAY_SIZE(devices)); - mxc_register_device(&mxc_keypad_device, &mbimx51_map_data); + imx51_add_imx_keypad(&mbimx51_map_data); gpio_request(MBIMX51_TSC2007_GPIO, "tsc2007_irq"); gpio_direction_input(MBIMX51_TSC2007_GPIO); |
