Merge tag 'for-linus-v3.9-rc1' of git://oss.sgi.com/xfs/xfs

[~andy/linux] / drivers / input / misc / dm355evm_keys.c

diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c
index 5409ab7684bb13ab65879e46f1b61f168eb4562b..a309a5c0899e365c59bf8c45517e6cb93dd3b276 100644 (file)
--- a/drivers/input/misc/dm355evm_keys.c
+++ b/drivers/input/misc/dm355evm_keys.c
@@ -239,7 +239,7 @@ fail1:
        return status;
 }
 
-static int __devexit dm355evm_keys_remove(struct platform_device *pdev)
+static int dm355evm_keys_remove(struct platform_device *pdev)
 {
        struct dm355evm_keys    *keys = platform_get_drvdata(pdev);