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 8e4b438ddc8d665f87990fb40ad23457b40c4091..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);