---

yaml --- r: 3739 b: refs/heads/master c: c47abbb h: refs/heads/master i: 3737: 36ad746 3735: d4ba044 v: v3
git-mirror · Jun 28, 2005 · b878497 · b878497
1 parent 67a453b
commit b878497
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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;
 	}