aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorTobias Oed <tobiasoed@hotmail.com>2006-06-26 00:26:18 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 09:58:28 -0700
commitfb4ece268bfebaa9f8084b3aa854b56867935724 (patch)
treef7f92fa7999995fc0fe00a3cb31370f7bf0c5b4f /drivers/ide
parent3d1c1cc962cebaae6a70fd89a0adb29ad10a2a12 (diff)
downloadkernel_samsung_tuna-fb4ece268bfebaa9f8084b3aa854b56867935724.zip
kernel_samsung_tuna-fb4ece268bfebaa9f8084b3aa854b56867935724.tar.gz
kernel_samsung_tuna-fb4ece268bfebaa9f8084b3aa854b56867935724.tar.bz2
[PATCH] pdc202xx_old depends on CONFIG_BLK_DEV_IDEDMA
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>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/pci/pdc202xx_old.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 4cb1564..e4d8717 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -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));