diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:29:17 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:29:17 +0100 |
commit | 3c1f67d60e2b4f4455563928999fd41cc653645d (patch) | |
tree | 0d58c145a05fb09167f1ab6882b474eccb1f3563 /drivers/ide/ide-io.c | |
parent | 03d78913f01e8f6599823f00357ed17b32747d3d (diff) | |
parent | 9ead64974b05501bbac0d63a47c99fa786d064ba (diff) | |
download | op-kernel-dev-3c1f67d60e2b4f4455563928999fd41cc653645d.zip op-kernel-dev-3c1f67d60e2b4f4455563928999fd41cc653645d.tar.gz |
Merge branch 'linus' into core/locking
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r-- | drivers/ide/ide-io.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 9ee51ad..a9a6c20 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -908,7 +908,7 @@ void ide_timer_expiry (unsigned long data) ide_drive_t *uninitialized_var(drive); ide_handler_t *handler; unsigned long flags; - unsigned long wait = -1; + int wait = -1; int plug_device = 0; spin_lock_irqsave(&hwif->lock, flags); @@ -1162,6 +1162,7 @@ out_early: return irq_ret; } +EXPORT_SYMBOL_GPL(ide_intr); /** * ide_do_drive_cmd - issue IDE special command |