From f3563e618acc4168b880d5e1ef017ad2e579ce87 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 3 Mar 2010 11:57:40 -0800 Subject: [PATCH] --- yaml --- r: 187038 b: refs/heads/master c: c1bf3acffcddcf794e3d8a1d25fb8bd4d5912383 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/wdt.c | 2 +- trunk/drivers/watchdog/wdt_pci.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9a5bfd2d73ec..7b8065e80871 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 168b5251adddb1554926cfb94f79a8a28bc6ebe5 +refs/heads/master: c1bf3acffcddcf794e3d8a1d25fb8bd4d5912383 diff --git a/trunk/drivers/watchdog/wdt.c b/trunk/drivers/watchdog/wdt.c index 3bbefe9a2634..bfda2e99dd89 100644 --- a/trunk/drivers/watchdog/wdt.c +++ b/trunk/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, diff --git a/trunk/drivers/watchdog/wdt_pci.c b/trunk/drivers/watchdog/wdt_pci.c index f368dd87083a..7b22e3cdbc81 100644 --- a/trunk/drivers/watchdog/wdt_pci.c +++ b/trunk/drivers/watchdog/wdt_pci.c @@ -412,7 +412,7 @@ static long wdtpci_ioctl(struct file *file, unsigned int cmd, int new_heartbeat; int status; - static struct watchdog_info ident = { + struct watchdog_info ident = { .options = WDIOF_SETTIMEOUT| WDIOF_MAGICCLOSE| WDIOF_KEEPALIVEPING,