Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp

[cascardo/linux.git] / drivers / watchdog / pcwd.c

diff --git a/drivers/watchdog/pcwd.c b/drivers/watchdog/pcwd.c
index cef246a..33e49a7 100644 (file)
--- a/drivers/watchdog/pcwd.c
+++ b/drivers/watchdog/pcwd.c
@@ -949,7 +949,7 @@ error_request_region:
        return ret;
 }
 
-static int __devexit pcwd_isa_remove(struct device *dev, unsigned int id)
+static int pcwd_isa_remove(struct device *dev, unsigned int id)
 {
        if (debug >= DEBUG)
                pr_debug("pcwd_isa_remove id=%d\n", id);