diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 21:10:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 21:10:59 +0200 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /drivers/cdrom/aztcd.c | |
| parent | [PATCH] I2C: i2c-nforce2: drop unused define (diff) | |
| parent | [PATCH] x86-64: clean up local_add/sub arguments (diff) | |
| download | linux-ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489.tar.xz linux-ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489.zip | |
Merge ../torvalds-2.6/
Diffstat (limited to 'drivers/cdrom/aztcd.c')
| -rw-r--r-- | drivers/cdrom/aztcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c index 43bf1e5dc38a..ce4a1ce59d6a 100644 --- a/drivers/cdrom/aztcd.c +++ b/drivers/cdrom/aztcd.c @@ -297,7 +297,7 @@ static char azt_auto_eject = AZT_AUTO_EJECT; static int AztTimeout, AztTries; static DECLARE_WAIT_QUEUE_HEAD(azt_waitq); -static struct timer_list delay_timer = TIMER_INITIALIZER(NULL, 0, 0); +static DEFINE_TIMER(delay_timer, NULL, 0, 0); static struct azt_DiskInfo DiskInfo; static struct azt_Toc Toc[MAX_TRACKS]; |