projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
[powerpc.git]
/
drivers
/
char
/
watchdog
/
mixcomwd.c
diff --git
a/drivers/char/watchdog/mixcomwd.c
b/drivers/char/watchdog/mixcomwd.c
index
c9b301d
..
7fc2188
100644
(file)
--- a/
drivers/char/watchdog/mixcomwd.c
+++ b/
drivers/char/watchdog/mixcomwd.c
@@
-59,7
+59,7
@@
static unsigned long mixcomwd_opened; /* long req'd for setbit --RR */
static int watchdog_port;
static int mixcomwd_timer_alive;
-static
struct timer_list mixcomwd_timer = TIMER_INITIALIZER(
NULL, 0, 0);
+static
DEFINE_TIMER(mixcomwd_timer,
NULL, 0, 0);
static char expect_close;
static int nowayout = WATCHDOG_NOWAYOUT;