From b878497d23d4a949d02e133116ff7061bb6f1974 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Mon, 27 Jun 2005 15:24:31 -0700
Subject: [PATCH] --- yaml --- r: 3739 b: refs/heads/master c:
 c47abbbffd17a7e774ec1ef952a1c3621a9cb13b h: refs/heads/master i:   3737:
 36ad74655d2b47009bfd17561dd54c173d82fa0f   3735:
 d4ba044f6a1723c6970054c0b8ef2ecd6d86e600 v: v3

---
 [refs]                       |  2 +-
 trunk/include/asm-i386/ide.h | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d2346bf22420..6968bba3cfa6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da9091ee3b5f9808c64abb925cefe7b100018614
+refs/heads/master: c47abbbffd17a7e774ec1ef952a1c3621a9cb13b
diff --git a/trunk/include/asm-i386/ide.h b/trunk/include/asm-i386/ide.h
index 859ebf4da632..79dfab87135d 100644
--- a/trunk/include/asm-i386/ide.h
+++ b/trunk/include/asm-i386/ide.h
@@ -41,13 +41,17 @@ static __inline__ int ide_default_irq(unsigned long base)
 
 static __inline__ unsigned long ide_default_io_base(int index)
 {
+	if (pci_find_device(PCI_ANY_ID, PCI_ANY_ID, NULL) == NULL) {
+		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;
 	}