Merge branch 'barrier' into for-linus

[cascardo/linux.git] / drivers / ide / ide-iops.c

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index e5fc2e5..aa73883 100644 (file)
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -613,15 +613,10 @@ u8 eighty_ninty_three (ide_drive_t *drive)
 
        /*
         * FIXME:
-        * - change master/slave IDENTIFY order
         * - force bit13 (80c cable present) check also for !ivb devices
         *   (unless the slave device is pre-ATA3)
         */
-#ifndef CONFIG_IDEDMA_IVB
        if ((id->hw_config & 0x4000) || (ivb && (id->hw_config & 0x2000)))
-#else
-       if (id->hw_config & 0x6000)
-#endif
                return 1;
 
 no_80w:
@@ -862,9 +857,6 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
        return error;
 }
 
-EXPORT_SYMBOL(ide_config_drive_speed);
-
-
 /*
  * This should get invoked any time we exit the driver to
  * wait for an interrupt response from a drive.  handler() points