projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
watchdog
/
ixp4xx_wdt.c
diff --git
a/drivers/watchdog/ixp4xx_wdt.c
b/drivers/watchdog/ixp4xx_wdt.c
index e02c0ecda26b73a7688ddc3352e99016350b67ab..4fc2e9ac26f7c818768c0e6f1a05a78b789cd7e7 100644
(file)
--- a/
drivers/watchdog/ixp4xx_wdt.c
+++ b/
drivers/watchdog/ixp4xx_wdt.c
@@
-181,7
+181,6
@@
static int __init ixp4xx_wdt_init(void)
return -ENODEV;
}
- spin_lock_init(&wdt_lock);
boot_status = (*IXP4XX_OSST & IXP4XX_OSST_TIMER_WARM_RESET) ?
WDIOF_CARDRESET : 0;
ret = misc_register(&ixp4xx_wdt_miscdev);