From 62864a050e9e26ab849875a90aabcbae50b08bc9 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 26 Jan 2008 20:13:08 +0100
Subject: [PATCH] --- yaml --- r: 77262 b: refs/heads/master c:
 6828fc9a919b06723599192300053ddf6f638c95 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/ide/setup-pci.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 60c0597dfc02..9ea68d16871b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa79a2faa01ded0a6a4929dd37c059bef4890838
+refs/heads/master: 6828fc9a919b06723599192300053ddf6f638c95
diff --git a/trunk/drivers/ide/setup-pci.c b/trunk/drivers/ide/setup-pci.c
index 63ef8aaa7b90..caa4a6a32711 100644
--- a/trunk/drivers/ide/setup-pci.c
+++ b/trunk/drivers/ide/setup-pci.c
@@ -390,13 +390,9 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, const struct ide_port
 		hw_regs_t hw;
 
 		memset(&hw, 0, sizeof(hw));
-#ifndef CONFIG_IDE_ARCH_OBSOLETE_INIT
 		ide_std_init_ports(&hw, base, ctl | 2);
-#else
-		ide_init_hwif_ports(&hw, base, ctl | 2, NULL);
-#endif
 		memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
-		hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
+		hwif->noprobe = 0;
 	}
 	hwif->chipset = d->chipset ? d->chipset : ide_pci;
 	hwif->pci_dev = dev;