diff options
Diffstat (limited to 'drivers/cdrom/sbpcd.c')
-rw-r--r-- | drivers/cdrom/sbpcd.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c index 452d34675159..30a897755361 100644 --- a/drivers/cdrom/sbpcd.c +++ b/drivers/cdrom/sbpcd.c | |||
@@ -742,13 +742,10 @@ static struct sbpcd_drive *current_drive = D_S; | |||
742 | unsigned long cli_sti; /* for saving the processor flags */ | 742 | unsigned long cli_sti; /* for saving the processor flags */ |
743 | #endif | 743 | #endif |
744 | /*==========================================================================*/ | 744 | /*==========================================================================*/ |
745 | static struct timer_list delay_timer = | 745 | static DEFINE_TIMER(delay_timer, mark_timeout_delay, 0, 0); |
746 | TIMER_INITIALIZER(mark_timeout_delay, 0, 0); | 746 | static DEFINE_TIMER(data_timer, mark_timeout_data, 0, 0); |
747 | static struct timer_list data_timer = | ||
748 | TIMER_INITIALIZER(mark_timeout_data, 0, 0); | ||
749 | #if 0 | 747 | #if 0 |
750 | static struct timer_list audio_timer = | 748 | static DEFINE_TIMER(audio_timer, mark_timeout_audio, 0, 0); |
751 | TIMER_INITIALIZER(mark_timeout_audio, 0, 0); | ||
752 | #endif | 749 | #endif |
753 | /*==========================================================================*/ | 750 | /*==========================================================================*/ |
754 | /* | 751 | /* |