git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
cdrom
/
sjcd.c
diff --git
a/drivers/cdrom/sjcd.c
b/drivers/cdrom/sjcd.c
index
4e7a342
..
74b1cad
100644
(file)
--- 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, \