projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
[cascardo/linux.git]
/
drivers
/
watchdog
/
mv64x60_wdt.c
diff --git
a/drivers/watchdog/mv64x60_wdt.c
b/drivers/watchdog/mv64x60_wdt.c
index
2876027
..
c7fb878
100644
(file)
--- a/
drivers/watchdog/mv64x60_wdt.c
+++ b/
drivers/watchdog/mv64x60_wdt.c
@@
-287,7
+287,7
@@
static int mv64x60_wdt_probe(struct platform_device *dev)
return misc_register(&mv64x60_wdt_miscdev);
}
-static int
__devexit
mv64x60_wdt_remove(struct platform_device *dev)
+static int mv64x60_wdt_remove(struct platform_device *dev)
{
misc_deregister(&mv64x60_wdt_miscdev);