aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cdrom/sjcd.c
diff options
context:
space:
mode:
authorGreg KH <gregkh@suse.de>2005-09-12 12:10:59 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-12 12:10:59 -0700
commitad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch)
tree5571f6a5784f51efddf9c1ee0408894cd63a460f /drivers/cdrom/sjcd.c
parent[PATCH] I2C: i2c-nforce2: drop unused define (diff)
parent[PATCH] x86-64: clean up local_add/sub arguments (diff)
downloadlinux-dev-ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489.tar.xz
linux-dev-ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489.zip
Merge ../torvalds-2.6/
Diffstat (limited to 'drivers/cdrom/sjcd.c')
-rw-r--r--drivers/cdrom/sjcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/sjcd.c b/drivers/cdrom/sjcd.c
index 4e7a342ec36f..74b1cadbf161 100644
--- a/drivers/cdrom/sjcd.c
+++ b/drivers/cdrom/sjcd.c
@@ -151,7 +151,7 @@ static struct sjcd_stat statistic;
/*
* Timer.
*/
-static struct timer_list sjcd_delay_timer = TIMER_INITIALIZER(NULL, 0, 0);
+static DEFINE_TIMER(sjcd_delay_timer, NULL, 0, 0);
#define SJCD_SET_TIMER( func, tmout ) \
( sjcd_delay_timer.expires = jiffies+tmout, \