summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-probe.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz2007-10-16 22:29:58 +0200
committerBartlomiej Zolnierkiewicz2007-10-16 22:29:58 +0200
commit8c0697cc2c798fe11bbb9cf2dbe123892ecab91a (patch)
tree3e0386a6cf3e11e2c35a908845793ab93eabe12b /drivers/ide/ide-probe.c
parentide: add "hdx=nodma" kernel parameter (diff)
downloadkernel-qcow2-linux-8c0697cc2c798fe11bbb9cf2dbe123892ecab91a.tar.gz
kernel-qcow2-linux-8c0697cc2c798fe11bbb9cf2dbe123892ecab91a.tar.xz
kernel-qcow2-linux-8c0697cc2c798fe11bbb9cf2dbe123892ecab91a.zip
ide: remove CONFIG_IDEDMA_ONLYDISK
ATAPI devices with broken DMA support should be handled by DMA blacklist and for debugging purposes we have new shiny "hdx=nodma" kernel paremeter. Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r--drivers/ide/ide-probe.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 41e7a4229fc4..3c945d64d845 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -843,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);
}
}
}