summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/sbc8360.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-02 19:36:26 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-02 19:36:26 -0700
commit71527bf8332ced9a961827272fe2f83fc5514f42 (patch)
treeca20ec292a2d3111e2aa06fe01a5635e91a704b1 /drivers/watchdog/sbc8360.c
parent434a25d422db13729da14637325875dc64c05faf (diff)
parentacf603513ebc0ebf209f087fb7b9237b0c0a2581 (diff)
downloadop-kernel-dev-71527bf8332ced9a961827272fe2f83fc5514f42.zip
op-kernel-dev-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/sbc8360.c')
-rw-r--r--drivers/watchdog/sbc8360.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/watchdog/sbc8360.c b/drivers/watchdog/sbc8360.c
index 285d852..2ee2677 100644
--- a/drivers/watchdog/sbc8360.c
+++ b/drivers/watchdog/sbc8360.c
@@ -54,7 +54,7 @@
#include <asm/system.h>
static unsigned long sbc8360_is_open;
-static spinlock_t sbc8360_lock;
+static DEFINE_SPINLOCK(sbc8360_lock);
static char expect_close;
#define PFX "sbc8360: "
@@ -359,7 +359,6 @@ static int __init sbc8360_init(void)
goto out_noreboot;
}
- spin_lock_init(&sbc8360_lock);
res = misc_register(&sbc8360_miscdev);
if (res) {
printk(KERN_ERR PFX "failed to register misc device\n");
OpenPOWER on IntegriCloud