Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[sfrench/cifs-2.6.git] / drivers / char / ftape / lowlevel / fdc-io.c

diff --git a/drivers/char/ftape/lowlevel/fdc-io.c b/drivers/char/ftape/lowlevel/fdc-io.c
index b2e0928e84288b6a392e7951fd3724649a54fd27..093fdf98b19a999dddc9b8ebe1dfe87dd4a2ad15 100644 (file)
--- a/drivers/char/ftape/lowlevel/fdc-io.c
+++ b/drivers/char/ftape/lowlevel/fdc-io.c
@@ -607,7 +607,7 @@ void fdc_reset(void)
 
        fdc_mode = fdc_idle;
 
-       /*  maybe the cli()/sti() pair is not necessary, BUT:
+       /*  maybe the spin_lock_irq* pair is not necessary, BUT:
         *  the following line MUST be here. Otherwise fdc_interrupt_wait()
         *  won't wait. Note that fdc_reset() is called from 
         *  ftape_dumb_stop() when the fdc is busy transferring data. In this