diff options
-rw-r--r-- | drivers/watchdog/rc32434_wdt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c index f1f98cd757c6..f3553fa40b17 100644 --- a/drivers/watchdog/rc32434_wdt.c +++ b/drivers/watchdog/rc32434_wdt.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <asm/time.h> | 34 | #include <asm/time.h> |
35 | #include <asm/mach-rc32434/integ.h> | 35 | #include <asm/mach-rc32434/integ.h> |
36 | 36 | ||
37 | #define VERSION "0.3" | 37 | #define VERSION "0.4" |
38 | 38 | ||
39 | static struct { | 39 | static struct { |
40 | unsigned long inuse; | 40 | unsigned long inuse; |
@@ -242,10 +242,10 @@ static struct miscdevice rc32434_wdt_miscdev = { | |||
242 | .fops = &rc32434_wdt_fops, | 242 | .fops = &rc32434_wdt_fops, |
243 | }; | 243 | }; |
244 | 244 | ||
245 | static char banner[] = KERN_INFO KBUILD_MODNAME | 245 | static char banner[] __devinitdata = KERN_INFO KBUILD_MODNAME |
246 | ": Watchdog Timer version " VERSION ", timer margin: %d sec\n"; | 246 | ": Watchdog Timer version " VERSION ", timer margin: %d sec\n"; |
247 | 247 | ||
248 | static int rc32434_wdt_probe(struct platform_device *pdev) | 248 | static int __devinit rc32434_wdt_probe(struct platform_device *pdev) |
249 | { | 249 | { |
250 | int ret; | 250 | int ret; |
251 | struct resource *r; | 251 | struct resource *r; |
@@ -280,7 +280,7 @@ unmap: | |||
280 | return ret; | 280 | return ret; |
281 | } | 281 | } |
282 | 282 | ||
283 | static int rc32434_wdt_remove(struct platform_device *pdev) | 283 | static int __devexit rc32434_wdt_remove(struct platform_device *pdev) |
284 | { | 284 | { |
285 | misc_deregister(&rc32434_wdt_miscdev); | 285 | misc_deregister(&rc32434_wdt_miscdev); |
286 | iounmap(wdt_reg); | 286 | iounmap(wdt_reg); |
@@ -289,8 +289,8 @@ static int rc32434_wdt_remove(struct platform_device *pdev) | |||
289 | 289 | ||
290 | static struct platform_driver rc32434_wdt = { | 290 | static struct platform_driver rc32434_wdt = { |
291 | .probe = rc32434_wdt_probe, | 291 | .probe = rc32434_wdt_probe, |
292 | .remove = rc32434_wdt_remove, | 292 | .remove = __devexit_p(rc32434_wdt_remove), |
293 | .driver = { | 293 | .driver = { |
294 | .name = "rc32434_wdt", | 294 | .name = "rc32434_wdt", |
295 | } | 295 | } |
296 | }; | 296 | }; |