diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:01:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:01:25 -0400 |
| commit | d7f6884ae0ae6e406ec3500fcde16e8f51642460 (patch) | |
| tree | efceb246a4fa12921b7dbd3946a88fa257684405 /drivers/cdrom/optcd.c | |
| parent | cd28ab6a4e50a7601d22752aa7ce0c8197b10bdf (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
| download | kernel-crypto-d7f6884ae0ae6e406ec3500fcde16e8f51642460.tar.gz kernel-crypto-d7f6884ae0ae6e406ec3500fcde16e8f51642460.tar.xz kernel-crypto-d7f6884ae0ae6e406ec3500fcde16e8f51642460.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/cdrom/optcd.c')
| -rw-r--r-- | drivers/cdrom/optcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/optcd.c b/drivers/cdrom/optcd.c index 351a01dd503..0b0eab4f40f 100644 --- a/drivers/cdrom/optcd.c +++ b/drivers/cdrom/optcd.c @@ -264,7 +264,7 @@ static inline int flag_low(int flag, unsigned long timeout) static int sleep_timeout; /* max # of ticks to sleep */ static DECLARE_WAIT_QUEUE_HEAD(waitq); static void sleep_timer(unsigned long data); -static struct timer_list delay_timer = TIMER_INITIALIZER(sleep_timer, 0, 0); +static DEFINE_TIMER(delay_timer, sleep_timer, 0, 0); static DEFINE_SPINLOCK(optcd_lock); static struct request_queue *opt_queue; |