X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fcdrom%2Foptcd.c;h=0b0eab4f40fa989dd9c215b089282bc8d8fa106a;hb=20dd6f59d6ea5fe47397c5254606c76b1d047727;hp=351a01dd503a3ceea3073f0c6dd31acd82e4c70f;hpb=33ac02aa4cef417871e128ab4a6565e751e5f3b2;p=pandora-kernel.git diff --git a/drivers/cdrom/optcd.c b/drivers/cdrom/optcd.c index 351a01dd503a..0b0eab4f40fa 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;