From ab9cee4b2167f8bf01d85b537df5b9cbe342c780 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Thu, 11 Nov 2010 11:35:33 +0100 Subject: ARM: mx25: dynamically allocate imx-keypad devices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The mxc-keypad device seems to be the result of an early and partial merge of the keypad driver. It's unused and there is no corresponding driver available, so just remove it. Cc: Alberto Panizzo Signed-off-by: Uwe Kleine-König --- arch/arm/mach-mx25/mach-mx25_3ds.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-mx25/mach-mx25_3ds.c') diff --git a/arch/arm/mach-mx25/mach-mx25_3ds.c b/arch/arm/mach-mx25/mach-mx25_3ds.c index 574c41f510df..1d07cfbd8ff6 100644 --- a/arch/arm/mach-mx25/mach-mx25_3ds.c +++ b/arch/arm/mach-mx25/mach-mx25_3ds.c @@ -181,7 +181,7 @@ static const uint32_t mx25pdk_keymap[] = { KEY(3, 3, KEY_POWER), }; -static struct matrix_keymap_data mx25pdk_keymap_data = { +static const struct matrix_keymap_data mx25pdk_keymap_data __initdata = { .keymap = mx25pdk_keymap, .keymap_size = ARRAY_SIZE(mx25pdk_keymap), }; @@ -200,7 +200,7 @@ static void __init mx25pdk_init(void) mx25pdk_fec_reset(); imx25_add_fec(&mx25_fec_pdata); - mxc_register_device(&mx25_kpp_device, &mx25pdk_keymap_data); + imx25_add_imx_keypad(&mx25pdk_keymap_data); imx25_add_esdhc(0, NULL); } -- cgit v1.2.3