projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[cascardo/linux.git]
/
drivers
/
cdrom
/
gscd.c
diff --git
a/drivers/cdrom/gscd.c
b/drivers/cdrom/gscd.c
index
7eac10e
..
ad5464a
100644
(file)
--- a/
drivers/cdrom/gscd.c
+++ b/
drivers/cdrom/gscd.c
@@
-146,7
+146,7
@@
static int AudioStart_f;
static int AudioEnd_m;
static int AudioEnd_f;
-static
struct timer_list gscd_timer = TIMER_INITIALIZER(
NULL, 0, 0);
+static
DEFINE_TIMER(gscd_timer,
NULL, 0, 0);
static DEFINE_SPINLOCK(gscd_lock);
static struct request_queue *gscd_queue;