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:/home/rmk/linux-2.6-serial
[powerpc.git]
/
drivers
/
char
/
hangcheck-timer.c
diff --git
a/drivers/char/hangcheck-timer.c
b/drivers/char/hangcheck-timer.c
index
81d811e
..
a54bc93
100644
(file)
--- a/
drivers/char/hangcheck-timer.c
+++ b/
drivers/char/hangcheck-timer.c
@@
-149,8
+149,7
@@
static unsigned long long hangcheck_tsc, hangcheck_tsc_margin;
static void hangcheck_fire(unsigned long);
-static struct timer_list hangcheck_ticktock =
- TIMER_INITIALIZER(hangcheck_fire, 0, 0);
+static DEFINE_TIMER(hangcheck_ticktock, hangcheck_fire, 0, 0);
static void hangcheck_fire(unsigned long data)