From 26324df37ac9e787d346a1760cc504d63e3cf5a4 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Fri, 8 Aug 2008 18:18:46 +0300
Subject: [PATCH] --- yaml --- r: 108135 b: refs/heads/master c:
 f8494e061799905dc2eb787c148cfbfb134b928f h: refs/heads/master i:   108133:
 bba7d507491a8b29a432e8178fcaba12dfc2f4b7   108131:
 4e515473606b6c25ee6e729f3c12a7b25c951583   108127:
 b94b03deb196483fa7f99c4b73cd305aa2da4ea1 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/watchdog/txx9wdt.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 065fd8bc9e26..f12b55fa395b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0960f4bfbe98152ee5edfd25d7da9e2b00e1aba
+refs/heads/master: f8494e061799905dc2eb787c148cfbfb134b928f
diff --git a/trunk/drivers/watchdog/txx9wdt.c b/trunk/drivers/watchdog/txx9wdt.c
index dbbc018a5f46..6adab77fbbb0 100644
--- a/trunk/drivers/watchdog/txx9wdt.c
+++ b/trunk/drivers/watchdog/txx9wdt.c
@@ -45,7 +45,7 @@ static unsigned long txx9wdt_alive;
 static int expect_close;
 static struct txx9_tmr_reg __iomem *txx9wdt_reg;
 static struct clk *txx9_imclk;
-static DECLARE_LOCK(txx9_lock);
+static DEFINE_SPINLOCK(txx9_lock);
 
 static void txx9wdt_ping(void)
 {