Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[~andy/linux] / drivers / watchdog / geodewdt.c

diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c
index a340e04f2379c01fb4b0f35c3cd8a2e0f92aa516..fcd599d4e22542a085fffa4619c9f163d4adb114 100644 (file)
--- a/drivers/watchdog/geodewdt.c
+++ b/drivers/watchdog/geodewdt.c
@@ -215,7 +215,7 @@ static struct miscdevice geodewdt_miscdev = {
        .fops = &geodewdt_fops,
 };
 
-static int __devinit geodewdt_probe(struct platform_device *dev)
+static int geodewdt_probe(struct platform_device *dev)
 {
        int ret;
 
@@ -243,7 +243,7 @@ static int __devinit geodewdt_probe(struct platform_device *dev)
        return ret;
 }
 
-static int __devexit geodewdt_remove(struct platform_device *dev)
+static int geodewdt_remove(struct platform_device *dev)
 {
        misc_deregister(&geodewdt_miscdev);
        return 0;