---

yaml --- r: 33599 b: refs/heads/master c: 954c0b7 h: refs/heads/master i: 33597: 274f349 33595: 48f30ed 33591: d5d1b2d 33583: f9b8cd5 33567: 6281eb0 33535: b175f1d v: v3
git-mirror · Aug 26, 2006 · e352d70 · e352d70
1 parent 3e9824e
commit e352d70
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: faf9b616325430422fa13fead88ca7843eb249d6
+refs/heads/master: 954c0b7cd5b9aaa11fb67a0c011fcb5e5897385a
diff --git a/trunk/arch/i386/pci/init.c b/trunk/arch/i386/pci/init.c
@@ -14,8 +14,12 @@ static __init int pci_access_init(void)
 #ifdef CONFIG_PCI_BIOS
 	pci_pcbios_init();
 #endif
-	if (raw_pci_ops)
-		return 0;
+	/*
+	 * don't check for raw_pci_ops here because we want pcbios as last
+	 * fallback, yet it's needed to run first to set pcibios_last_bus
+	 * in case legacy PCI probing is used. otherwise detecting peer busses
+	 * fails.
+	 */
 #ifdef CONFIG_PCI_DIRECT
 	pci_direct_init();
 #endif