projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master'
[powerpc.git]
/
drivers
/
block
/
acsi.c
diff --git
a/drivers/block/acsi.c
b/drivers/block/acsi.c
index
ce933de
..
0e1f34f
100644
(file)
--- a/
drivers/block/acsi.c
+++ b/
drivers/block/acsi.c
@@
-371,7
+371,7
@@
static int acsi_revalidate (struct gendisk *disk);
/************************* End of Prototypes **************************/
-
struct timer_list acsi_timer = TIMER_INITIALIZER(
acsi_times_out, 0, 0);
+
DEFINE_TIMER(acsi_timer,
acsi_times_out, 0, 0);
#ifdef CONFIG_ATARI_SLM