Merge branch 'x86-nuke386-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / watchdog / ath79_wdt.c

diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
index 1f9371f49c402c71422edc364871fa8c3bf9c149..7c8ede7816b1a1efacf9a196648bcfb2b5bc4c0c 100644 (file)
--- a/drivers/watchdog/ath79_wdt.c
+++ b/drivers/watchdog/ath79_wdt.c
@@ -224,7 +224,7 @@ static struct miscdevice ath79_wdt_miscdev = {
        .fops = &ath79_wdt_fops,
 };
 
-static int __devinit ath79_wdt_probe(struct platform_device *pdev)
+static int ath79_wdt_probe(struct platform_device *pdev)
 {
        u32 ctrl;
        int err;
@@ -270,7 +270,7 @@ err_clk_put:
        return err;
 }
 
-static int __devexit ath79_wdt_remove(struct platform_device *pdev)
+static int ath79_wdt_remove(struct platform_device *pdev)
 {
        misc_deregister(&ath79_wdt_miscdev);
        clk_disable(wdt_clk);
@@ -284,7 +284,7 @@ static void ath97_wdt_shutdown(struct platform_device *pdev)
 }
 
 static struct platform_driver ath79_wdt_driver = {
-       .remove         = __devexit_p(ath79_wdt_remove),
+       .remove         = ath79_wdt_remove,
        .shutdown       = ath97_wdt_shutdown,
        .driver         = {
                .name   = DRIVER_NAME,