diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 05:36:26 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 05:36:26 +0300 |
| commit | 71527bf8332ced9a961827272fe2f83fc5514f42 (patch) | |
| tree | ca20ec292a2d3111e2aa06fe01a5635e91a704b1 /drivers/watchdog/sc1200wdt.c | |
| parent | 434a25d422db13729da14637325875dc64c05faf (diff) | |
| parent | acf603513ebc0ebf209f087fb7b9237b0c0a2581 (diff) | |
| download | linux-71527bf8332ced9a961827272fe2f83fc5514f42.tar.xz | |
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/sc1200wdt.c')
| -rw-r--r-- | drivers/watchdog/sc1200wdt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/watchdog/sc1200wdt.c b/drivers/watchdog/sc1200wdt.c index 9670d47190d0..32ccd7c89c7d 100644 --- a/drivers/watchdog/sc1200wdt.c +++ b/drivers/watchdog/sc1200wdt.c @@ -74,7 +74,7 @@ static int io = -1; static int io_len = 2; /* for non plug and play */ static struct semaphore open_sem; static char expect_close; -static spinlock_t sc1200wdt_lock; /* io port access serialisation */ +static DEFINE_SPINLOCK(sc1200wdt_lock); /* io port access serialisation */ #if defined CONFIG_PNP static int isapnp = 1; @@ -375,7 +375,6 @@ static int __init sc1200wdt_init(void) printk("%s\n", banner); - spin_lock_init(&sc1200wdt_lock); sema_init(&open_sem, 1); #if defined CONFIG_PNP |