From e352d70c2ed55e5ef1b6da7de0f5435b72bc4810 Mon Sep 17 00:00:00 2001
From: Daniel Ritz <daniel.ritz-ml@swissonline.ch>
Date: Tue, 22 Aug 2006 07:29:08 -0700
Subject: [PATCH] --- yaml --- r: 33599 b: refs/heads/master c:
 954c0b7cd5b9aaa11fb67a0c011fcb5e5897385a h: refs/heads/master i:   33597:
 274f34908611a31847e8787a43859fcb7cc7afc3   33595:
 48f30ed1dbf27d5a5325dd87f63a687d5e50e939   33591:
 d5d1b2dd865f411730d3ad0e1dde0306ea33a2cc   33583:
 f9b8cd58d5cfc3749d6ba1f771b18648383f3672   33567:
 6281eb028d01457d9daebe30fa7e9012eac9db93   33535:
 b175f1d8f1f45ef830bd9b6e610ca78facbc23ac v: v3

---
 [refs]                     | 2 +-
 trunk/arch/i386/pci/init.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c29cf7cfef80..7189f69e7c5c 100644
--- 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
index c7650a7e0b07..51087a9d9172 100644
--- 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