From c7407cddd2e279f08b5abed2717acfc0b6937568 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Thu, 24 Jul 2008 22:53:28 +0200
Subject: [PATCH] --- yaml --- r: 105732 b: refs/heads/master c:
 b6cd7da5be2522b62bbc48d41b36c828b88e02fe h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/include/asm-mips/mach-generic/ide.h | 18 ++++--------------
 trunk/include/asm-x86/ide.h               | 18 ++++--------------
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/[refs] b/[refs]
index d293b7f9361e..293c58e8e3be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbdec839c4c2bfc8f2da8e50c06b9947e5ad0394
+refs/heads/master: b6cd7da5be2522b62bbc48d41b36c828b88e02fe
diff --git a/trunk/include/asm-mips/mach-generic/ide.h b/trunk/include/asm-mips/mach-generic/ide.h
index 71a01c5aec16..f34740ee6775 100644
--- a/trunk/include/asm-mips/mach-generic/ide.h
+++ b/trunk/include/asm-mips/mach-generic/ide.h
@@ -72,23 +72,13 @@ static __inline__ int ide_default_irq(unsigned long base)
 
 static __inline__ unsigned long ide_default_io_base(int index)
 {
-	/*
-	 *      If PCI is present then it is not safe to poke around
-	 *      the other legacy IDE ports. Only 0x1f0 and 0x170 are
-	 *      defined compatibility mode ports for PCI. A user can
-	 *      override this using ide= but we must default safe.
-	 */
-	if (no_pci_devices()) {
-		switch (index) {
-		case 2: return 0x1e8;
-		case 3: return 0x168;
-		case 4: return 0x1e0;
-		case 5: return 0x160;
-		}
-	}
 	switch (index) {
 	case 0: return 0x1f0;
 	case 1: return 0x170;
+	case 2: return 0x1e8;
+	case 3: return 0x168;
+	case 4: return 0x1e0;
+	case 5: return 0x160;
 	default:
 		return 0;
 	}
diff --git a/trunk/include/asm-x86/ide.h b/trunk/include/asm-x86/ide.h
index cf9c98e5bdb5..34050747f38c 100644
--- a/trunk/include/asm-x86/ide.h
+++ b/trunk/include/asm-x86/ide.h
@@ -36,23 +36,13 @@ static __inline__ int ide_default_irq(unsigned long base)
 
 static __inline__ unsigned long ide_default_io_base(int index)
 {
-	/*
-	 *	If PCI is present then it is not safe to poke around
-	 *	the other legacy IDE ports. Only 0x1f0 and 0x170 are
-	 *	defined compatibility mode ports for PCI. A user can 
-	 *	override this using ide= but we must default safe.
-	 */
-	if (no_pci_devices()) {
-		switch(index) {
-			case 2: return 0x1e8;
-			case 3: return 0x168;
-			case 4: return 0x1e0;
-			case 5: return 0x160;
-		}
-	}
 	switch (index) {
 		case 0:	return 0x1f0;
 		case 1:	return 0x170;
+		case 2: return 0x1e8;
+		case 3: return 0x168;
+		case 4: return 0x1e0;
+		case 5: return 0x160;
 		default:
 			return 0;
 	}