From c55185ce79146cb5b65ed5c35d8b7dba624c6097 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sun, 10 Aug 2008 14:03:41 +0300 Subject: [PATCH] --- yaml --- r: 108139 b: refs/heads/master c: 9229376e9beba0dd449dd4869283545c1d042128 h: refs/heads/master i: 108137: 38aebed5781335d6cc4ef4890fc7046d5c3e9148 108135: 26324df37ac9e787d346a1760cc504d63e3cf5a4 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/ixp4xx_wdt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 43cd55ddacd4..7c07b3dd49bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f11df21ac09e1c75b32d903031550cfc55a7f81 +refs/heads/master: 9229376e9beba0dd449dd4869283545c1d042128 diff --git a/trunk/drivers/watchdog/ixp4xx_wdt.c b/trunk/drivers/watchdog/ixp4xx_wdt.c index 41264a5f1731..8302ef005be7 100644 --- a/trunk/drivers/watchdog/ixp4xx_wdt.c +++ b/trunk/drivers/watchdog/ixp4xx_wdt.c @@ -29,7 +29,7 @@ static int nowayout = WATCHDOG_NOWAYOUT; static int heartbeat = 60; /* (secs) Default is 1 minute */ static unsigned long wdt_status; static unsigned long boot_status; -static spin_lock_t wdt_lock; +static DEFINE_SPINLOCK(wdt_lock); #define WDT_TICK_RATE (IXP4XX_PERIPHERAL_BUS_CLOCK * 1000000UL)