Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / net / rfkill / rfkill-gpio.c

diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 865adb61685ac6478f99cc0627c3013574013887..78fc0937948df7b8bc2b865cd28d98a17506cc10 100644 (file)
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -213,7 +213,7 @@ static int rfkill_gpio_remove(struct platform_device *pdev)
 
 static struct platform_driver rfkill_gpio_driver = {
        .probe = rfkill_gpio_probe,
-       .remove = __devexit_p(rfkill_gpio_remove),
+       .remove = rfkill_gpio_remove,
        .driver = {
                   .name = "rfkill_gpio",
                   .owner = THIS_MODULE,