]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[PATCH] pdc202xx_old depends on CONFIG_BLK_DEV_IDEDMA
authorTobias Oed <tobiasoed@hotmail.com>
Mon, 26 Jun 2006 07:26:18 +0000 (00:26 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 26 Jun 2006 16:58:28 +0000 (09:58 -0700)
The driver pdc202xx_old requires CONFIG_BLK_DEV_IDEDMA, so it's always
defined

Signed-off-by: Tobias Oed <tobiasoed@hotmail.com>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/ide/pci/pdc202xx_old.c

index 4cb15644941f9b1d7a38810db57cc5b7e15baa8f..e4d87170b370c17df53c34c7c6510f49b4a47cf8 100644 (file)
@@ -491,12 +491,8 @@ static int pdc202xx_ide_dma_timeout(ide_drive_t *drive)
 
 static void pdc202xx_reset_host (ide_hwif_t *hwif)
 {
-#ifdef CONFIG_BLK_DEV_IDEDMA
 //     unsigned long high_16   = hwif->dma_base - (8*(hwif->channel));
        unsigned long high_16   = hwif->dma_master;
-#else /* !CONFIG_BLK_DEV_IDEDMA */
-       unsigned long high_16   = pci_resource_start(hwif->pci_dev, 4);
-#endif /* CONFIG_BLK_DEV_IDEDMA */
        u8 udma_speed_flag      = hwif->INB(high_16|0x001f);
 
        hwif->OUTB((udma_speed_flag | 0x10), (high_16|0x001f));