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 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
[cascardo/linux.git]
/
drivers
/
watchdog
/
mpc8xxx_wdt.c
diff --git
a/drivers/watchdog/mpc8xxx_wdt.c
b/drivers/watchdog/mpc8xxx_wdt.c
index
4cda64d
..
8fa213c
100644
(file)
--- a/
drivers/watchdog/mpc8xxx_wdt.c
+++ b/
drivers/watchdog/mpc8xxx_wdt.c
@@
-185,7
+185,7
@@
static struct miscdevice mpc8xxx_wdt_miscdev = {
.fops = &mpc8xxx_wdt_fops,
};
.fops = &mpc8xxx_wdt_fops,
};
-static int __devinit mpc8xxx_wdt_probe(struct
of
_device *ofdev,
+static int __devinit mpc8xxx_wdt_probe(struct
platform
_device *ofdev,
const struct of_device_id *match)
{
int ret;
const struct of_device_id *match)
{
int ret;
@@
-238,7
+238,7
@@
err_unmap:
return ret;
}
return ret;
}
-static int __devexit mpc8xxx_wdt_remove(struct
of
_device *ofdev)
+static int __devexit mpc8xxx_wdt_remove(struct
platform
_device *ofdev)
{
mpc8xxx_wdt_pr_warn("watchdog removed");
del_timer_sync(&wdt_timer);
{
mpc8xxx_wdt_pr_warn("watchdog removed");
del_timer_sync(&wdt_timer);