diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2011-04-06 13:05:26 -0300 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-05-19 13:11:25 +0200 |
| commit | ba8a6c04ea11fdd38a614ec7108de2bf7400b5ab (patch) | |
| tree | ccfa820b23426868cfc7f32dc84505a758772330 /arch | |
| parent | 18879e13b11b8c173a773edb258da51abc0bd2cd (diff) | |
| download | linux-ba8a6c04ea11fdd38a614ec7108de2bf7400b5ab.tar.gz linux-ba8a6c04ea11fdd38a614ec7108de2bf7400b5ab.tar.bz2 linux-ba8a6c04ea11fdd38a614ec7108de2bf7400b5ab.zip | |
ARM: mx51: Remove imx51_add_gpio_keys
There is no need for using a MX51-specific version of imx_add_gpio_keys.
Remove imx51_add_gpio_keys and use imx_add_gpio_keys instead.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
LAKML-Reference: 1302105926-20574-1-git-send-email-fabio.estevam@freescale.com
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx5/board-mx51_babbage.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/board-mx51_efikamx.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/board-mx51_efikasb.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/devices-imx51.h | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c index cba59f16b205..c7b3fabf50f9 100644 --- a/arch/arm/mach-mx5/board-mx51_babbage.c +++ b/arch/arm/mach-mx5/board-mx51_babbage.c @@ -355,7 +355,7 @@ static void __init mx51_babbage_init(void) /* Set the PAD settings for the pwr key. */ mxc_iomux_v3_setup_pad(power_key); - imx51_add_gpio_keys(&imx_button_data); + imx_add_gpio_keys(&imx_button_data); imx51_add_imx_i2c(0, &babbage_i2c_data); imx51_add_imx_i2c(1, &babbage_i2c_data); diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-mx5/board-mx51_efikamx.c index c7c94596887e..6e362315291b 100644 --- a/arch/arm/mach-mx5/board-mx51_efikamx.c +++ b/arch/arm/mach-mx5/board-mx51_efikamx.c @@ -249,7 +249,7 @@ static void __init mx51_efikamx_init(void) } platform_device_register(&mx51_efikamx_leds_device); - imx51_add_gpio_keys(&mx51_efikamx_powerkey_data); + imx_add_gpio_keys(&mx51_efikamx_powerkey_data); if (system_rev == 0x11) { gpio_request(EFIKAMX_RESET1_1, "reset"); diff --git a/arch/arm/mach-mx5/board-mx51_efikasb.c b/arch/arm/mach-mx5/board-mx51_efikasb.c index 57b4d6bc6bf8..474fc6e4c6df 100644 --- a/arch/arm/mach-mx5/board-mx51_efikasb.c +++ b/arch/arm/mach-mx5/board-mx51_efikasb.c @@ -257,7 +257,7 @@ static void __init efikasb_board_init(void) imx51_add_sdhci_esdhc_imx(1, NULL); platform_device_register(&mx51_efikasb_leds_device); - imx51_add_gpio_keys(&mx51_efikasb_keys_data); + imx_add_gpio_keys(&mx51_efikasb_keys_data); } diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-mx5/devices-imx51.h index e3253c506d50..e11bc0e0ec49 100644 --- a/arch/arm/mach-mx5/devices-imx51.h +++ b/arch/arm/mach-mx5/devices-imx51.h @@ -13,8 +13,6 @@ extern const struct imx_fec_data imx51_fec_data; #define imx51_add_fec(pdata) \ imx_add_fec(&imx51_fec_data, pdata) -#define imx51_add_gpio_keys(pdata) imx_add_gpio_keys(pdata) - extern const struct imx_imx_i2c_data imx51_imx_i2c_data[]; #define imx51_add_imx_i2c(id, pdata) \ imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata) |