diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /target/linux/generic/files/drivers/input | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'target/linux/generic/files/drivers/input')
| -rw-r--r-- | target/linux/generic/files/drivers/input/misc/gpio_buttons.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/files/drivers/input/misc/gpio_buttons.c b/target/linux/generic/files/drivers/input/misc/gpio_buttons.c index 51288a3f9..af5491434 100644 --- a/target/linux/generic/files/drivers/input/misc/gpio_buttons.c +++ b/target/linux/generic/files/drivers/input/misc/gpio_buttons.c @@ -82,7 +82,7 @@ static void gpio_buttons_poll(struct input_polled_dev *dev) } } -static int __devinit gpio_buttons_probe(struct platform_device *pdev) +static int gpio_buttons_probe(struct platform_device *pdev) { struct gpio_buttons_platform_data *pdata = pdev->dev.platform_data; struct device *dev = &pdev->dev; @@ -186,7 +186,7 @@ err_free_bdev: return error; } -static int __devexit gpio_buttons_remove(struct platform_device *pdev) +static int gpio_buttons_remove(struct platform_device *pdev) { struct gpio_buttons_dev *bdev = platform_get_drvdata(pdev); struct gpio_buttons_platform_data *pdata = bdev->pdata; @@ -207,7 +207,7 @@ static int __devexit gpio_buttons_remove(struct platform_device *pdev) static struct platform_driver gpio_buttons_driver = { .probe = gpio_buttons_probe, - .remove = __devexit_p(gpio_buttons_remove), + .remove = gpio_buttons_remove, .driver = { .name = DRV_NAME, .owner = THIS_MODULE, |