diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-03-10 16:41:57 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-10 16:41:57 +0900 |
| commit | d28c145debb1bd53cde63ac8bccc192e3e00067e (patch) | |
| tree | 87fb1d66cab7689aa662ebd0337b39ff1bf6f433 /drivers/watchdog/wdt.c | |
| parent | 2e733b3f84fa9c2ae60513c5f7b56d599ed2ae02 (diff) | |
| parent | ec0ffe2ee0e0fb9da4409d86bfd72636450f32df (diff) | |
| download | op-kernel-dev-d28c145debb1bd53cde63ac8bccc192e3e00067e.zip op-kernel-dev-d28c145debb1bd53cde63ac8bccc192e3e00067e.tar.gz | |
Merge branch 'sh/driver-core' into sh/clkfwk
Diffstat (limited to 'drivers/watchdog/wdt.c')
| -rw-r--r-- | drivers/watchdog/wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c index 3bbefe9..bfda2e9 100644 --- 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; - static struct watchdog_info ident = { + struct watchdog_info ident = { .options = WDIOF_SETTIMEOUT| WDIOF_MAGICCLOSE| WDIOF_KEEPALIVEPING, |
