summaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/files/arch/mips/ralink/common
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-02-11 19:37:06 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-02-11 19:37:06 +0000
commit32b9e8c750598b88e6989455768f873e59064092 (patch)
tree7699b7b21bf719e9cbcd08a1138df62c0e25f040 /target/linux/ramips/files/arch/mips/ralink/common
parent8ce80f74549c15e9a6579df6ae68648f17cadd29 (diff)
downloadmaster-31e0f0ae-32b9e8c750598b88e6989455768f873e59064092.tar.gz
master-31e0f0ae-32b9e8c750598b88e6989455768f873e59064092.tar.bz2
master-31e0f0ae-32b9e8c750598b88e6989455768f873e59064092.zip
ramips: use gpio-keys-polled instead of gpio-buttons
SVN-Revision: 30461
Diffstat (limited to 'target/linux/ramips/files/arch/mips/ralink/common')
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c b/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c
index 4d936d05c2..75a2a17143 100644
--- a/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c
+++ b/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c
@@ -17,11 +17,11 @@
void __init ramips_register_gpio_buttons(int id,
unsigned poll_interval,
unsigned nbuttons,
- struct gpio_button *buttons)
+ struct gpio_keys_button *buttons)
{
struct platform_device *pdev;
- struct gpio_buttons_platform_data pdata;
- struct gpio_button *p;
+ struct gpio_keys_platform_data pdata;
+ struct gpio_keys_button *p;
int err;
p = kmalloc(nbuttons * sizeof(*p), GFP_KERNEL);
@@ -30,7 +30,7 @@ void __init ramips_register_gpio_buttons(int id,
memcpy(p, buttons, nbuttons * sizeof(*p));
- pdev = platform_device_alloc("gpio-buttons", id);
+ pdev = platform_device_alloc("gpio-keys-polled", id);
if (!pdev)
goto err_free_buttons;
@@ -43,7 +43,6 @@ void __init ramips_register_gpio_buttons(int id,
if (err)
goto err_put_pdev;
-
err = platform_device_add(pdev);
if (err)
goto err_put_pdev;