1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index f5ce22c38f82..cc5801399467 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -144,7 +144,7 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
         local_irq_enable();
         ide_fix_driveid(id);
 
-#if defined (CONFIG_SCSI_EATA_DMA) || defined (CONFIG_SCSI_EATA_PIO) || defined (CONFIG_SCSI_EATA)
+#if defined (CONFIG_SCSI_EATA_PIO) || defined (CONFIG_SCSI_EATA)
         /*
          * EATA SCSI controllers do a hardware ATA emulation:
          * Ignore them if there is a driver for them available.
@@ -154,7 +154,7 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
                 printk("%s: EATA SCSI HBA %.10s\n", drive->name, id->model);
                 goto err_misc;
         }
-#endif /* CONFIG_SCSI_EATA_DMA || CONFIG_SCSI_EATA_PIO */
+#endif /* CONFIG_SCSI_EATA || CONFIG_SCSI_EATA_PIO */
 
         /*
          *  WIN_IDENTIFY returns little-endian info,
@@ -1025,7 +1025,7 @@ static int init_irq (ide_hwif_t *hwif)
         BUG_ON(irqs_disabled());        
         BUG_ON(hwif == NULL);
 
-        down(&ide_cfg_sem);
+        mutex_lock(&ide_cfg_mtx);
         hwif->hwgroup = NULL;
 #if MAX_HWIFS > 1
         /*
@@ -1154,7 +1154,7 @@ static int init_irq (ide_hwif_t *hwif)
                 printk(" (%sed with %s)",
                         hwif->sharing_irq ? "shar" : "serializ", match->name);
         printk("\n");
-        up(&ide_cfg_sem);
+        mutex_unlock(&ide_cfg_mtx);
         return 0;
 out_unlink:
         spin_lock_irq(&ide_lock);
@@ -1177,7 +1177,7 @@ out_unlink:
         }
         spin_unlock_irq(&ide_lock);
 out_up:
-        up(&ide_cfg_sem);
+        mutex_unlock(&ide_cfg_mtx);
         return 1;
 }