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 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
watchdog
/
wdt.c
diff --git
a/drivers/watchdog/wdt.c
b/drivers/watchdog/wdt.c
index 3bbefe9a2634d5af1e432ed4496f7294e360e64a..bfda2e99dd8908ffeb0d23e24c3b12dc92f682c8 100644
(file)
--- a/
drivers/watchdog/wdt.c
+++ b/
drivers/watchdog/wdt.c
@@
-358,7
+358,7
@@
static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
int new_heartbeat;
int status;
- st
atic st
ruct watchdog_info ident = {
+ struct watchdog_info ident = {
.options = WDIOF_SETTIMEOUT|
WDIOF_MAGICCLOSE|
WDIOF_KEEPALIVEPING,