git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'origin/drm-intel-next' of ../drm-intel into drm-fixes
[pandora-kernel.git]
/
drivers
/
watchdog
/
txx9wdt.c
diff --git
a/drivers/watchdog/txx9wdt.c
b/drivers/watchdog/txx9wdt.c
index
dbbc018
..
6adab77
100644
(file)
--- a/
drivers/watchdog/txx9wdt.c
+++ b/
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 DE
CLARE_
LOCK(txx9_lock);
+static DE
FINE_SPIN
LOCK(txx9_lock);
static void txx9wdt_ping(void)
{