diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-02 19:36:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-02 19:36:26 -0700 |
commit | 71527bf8332ced9a961827272fe2f83fc5514f42 (patch) | |
tree | ca20ec292a2d3111e2aa06fe01a5635e91a704b1 /drivers/watchdog/wafer5823wdt.c | |
parent | 434a25d422db13729da14637325875dc64c05faf (diff) | |
parent | acf603513ebc0ebf209f087fb7b9237b0c0a2581 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] iTCO_wdt.c ICH8 pci-device-id's
[WATCHDOG] iTCO_wdt.c init & exit fixes
[WATCHDOG] iTCO_wdt.c pci_device_id table clean-up
[WATCHDOG] spin_lock_init() fixes
[WATCHDOG] Unlock in iTCO_wdt_start when reboot is disabled
[WATCHDOG] Add necessary braces to if (...) \n #if... cases
[WATCHDOG] trivial fix two returns in void functions
Diffstat (limited to 'drivers/watchdog/wafer5823wdt.c')
-rw-r--r-- | drivers/watchdog/wafer5823wdt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c index 950905d3c39..9e368091f79 100644 --- a/drivers/watchdog/wafer5823wdt.c +++ b/drivers/watchdog/wafer5823wdt.c @@ -45,7 +45,7 @@ static unsigned long wafwdt_is_open; static char expect_close; -static spinlock_t wafwdt_lock; +static DEFINE_SPINLOCK(wafwdt_lock); /* * You must set these - there is no sane way to probe for this board. @@ -252,8 +252,6 @@ static int __init wafwdt_init(void) printk(KERN_INFO "WDT driver for Wafer 5823 single board computer initialising.\n"); - spin_lock_init(&wafwdt_lock); - if (timeout < 1 || timeout > 255) { timeout = WD_TIMO; printk (KERN_INFO PFX "timeout value must be 1<=x<=255, using %d\n", |