From: "Tobias Oed" The driver pdc202xx_old requires CONFIG_BLK_DEV_IDEDMA, so it's always defined Signed-off-by: Tobias Oed Cc: Alan Cox Cc: Bartlomiej Zolnierkiewicz Cc: Sergei Shtylyov Signed-off-by: Andrew Morton --- drivers/ide/pci/pdc202xx_old.c | 4 ---- 1 file changed, 4 deletions(-) diff -puN drivers/ide/pci/pdc202xx_old.c~pdc202xx_old-depends-on-config_blk_dev_idedma drivers/ide/pci/pdc202xx_old.c --- a/drivers/ide/pci/pdc202xx_old.c~pdc202xx_old-depends-on-config_blk_dev_idedma +++ a/drivers/ide/pci/pdc202xx_old.c @@ -491,12 +491,8 @@ static int pdc202xx_ide_dma_timeout(ide_ 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)); _