X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Framips%2Ffiles%2Farch%2Fmips%2Fralink%2Fcommon%2Fdev-gpio-buttons.c;h=75a2a17143bfd3c4a58edbf87883104fa1cd9b64;hp=4d936d05c24743c1059923388f58de81272fe80f;hb=7dfbfac36b02e58a36c8f0a6aa2155d70e070919;hpb=c0d57ff6bf00079b82a8ffb7f844b34ebc63e9c6 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;