Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6

[mv-sheeva.git] / drivers / block / acsi.c

diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c
index ce933de4808494445996ee5c161f8dbca576222e..0e1f34fef0c838e26b49e18706dd4c30e8f6bc8b 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