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/w83697hf_wdt.c | |
| parent | 434a25d422db13729da14637325875dc64c05faf (diff) | |
| parent | acf603513ebc0ebf209f087fb7b9237b0c0a2581 (diff) | |
| download | linux-71527bf8332ced9a961827272fe2f83fc5514f42.tar.gz | |
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/w83697hf_wdt.c')
| -rw-r--r-- | drivers/watchdog/w83697hf_wdt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c index 51826c216d6d..c622a0e6c9ae 100644 --- a/drivers/watchdog/w83697hf_wdt.c +++ b/drivers/watchdog/w83697hf_wdt.c @@ -47,7 +47,7 @@ static unsigned long wdt_is_open; static char expect_close; -static spinlock_t io_lock; +static DEFINE_SPINLOCK(io_lock); /* You must set this - there is no sane way to probe for this board. */ static int wdt_io = 0x2e; @@ -376,8 +376,6 @@ wdt_init(void) { int ret, i, found = 0; - spin_lock_init(&io_lock); - printk (KERN_INFO PFX "WDT driver for W83697HF/HG initializing\n"); if (wdt_io == 0) { |