Merge tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd

[firefly-linux-kernel-4.4.55.git] / drivers / input / keyboard / davinci_keyscan.c

diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c
index d5bacbb479b06f5bc1ef857c9a535f876291aab0..4e4e453ea15ec0f3cb51ca2e9eabda68ac698fee 100644 (file)
--- a/drivers/input/keyboard/davinci_keyscan.c
+++ b/drivers/input/keyboard/davinci_keyscan.c
@@ -303,7 +303,7 @@ fail1:
        return error;
 }
 
-static int __devexit davinci_ks_remove(struct platform_device *pdev)
+static int davinci_ks_remove(struct platform_device *pdev)
 {
        struct davinci_ks *davinci_ks = platform_get_drvdata(pdev);
 
@@ -326,7 +326,7 @@ static struct platform_driver davinci_ks_driver = {
                .name = "davinci_keyscan",
                .owner = THIS_MODULE,
        },
-       .remove = __devexit_p(davinci_ks_remove),
+       .remove = davinci_ks_remove,
 };
 
 static int __init davinci_ks_init(void)