Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / ide / ide-probe.c

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index c2d69d2d304411fc6af7ab509c27202e74436ff2..e294c7415c27aa048e9a734f3f4736f304e87483 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -835,15 +835,6 @@ static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))
 
                        drive->nice1 = 1;
 
-                       /*
-                        * MAJOR HACK BARF :-/
-                        *
-                        * FIXME: chipsets own this cruft!
-                        */
-                       /*
-                        * Move here to prevent module loading clashing.
-                        */
-       //              drive->autodma = hwif->autodma;
                        if (hwif->ide_dma_on) {
                                /*
                                 * Force DMAing for the beginning of the check.
@@ -852,10 +843,7 @@ static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))
                                 *   PARANOIA!!!
                                 */
                                hwif->dma_off_quietly(drive);
-#ifdef CONFIG_IDEDMA_ONLYDISK
-                               if (drive->media == ide_disk)
-#endif
-                                       ide_set_dma(drive);
+                               ide_set_dma(drive);
                        }
                }
        }
@@ -963,7 +951,8 @@ static int ide_init_queue(ide_drive_t *drive)
        blk_queue_segment_boundary(q, 0xffff);
 
        if (!hwif->rqsize) {
-               if (hwif->no_lba48 || hwif->no_lba48_dma)
+               if ((hwif->host_flags & IDE_HFLAG_NO_LBA48) ||
+                   (hwif->host_flags & IDE_HFLAG_NO_LBA48_DMA))
                        hwif->rqsize = 256;
                else
                        hwif->rqsize = 65536;