Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / arch / i386 / pci / init.c

diff --git a/arch/i386/pci/init.c b/arch/i386/pci/init.c
index 51087a9..f9156d3 100644 (file)
--- a/arch/i386/pci/init.c
+++ b/arch/i386/pci/init.c
@@ -1,3 +1,4 @@
+#include <linux/config.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 #include "pci.h"
@@ -14,12 +15,8 @@ static __init int pci_access_init(void)
 #ifdef CONFIG_PCI_BIOS
        pci_pcbios_init();
 #endif
-       /*
-        * 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.
-        */
+       if (raw_pci_ops)
+               return 0;
 #ifdef CONFIG_PCI_DIRECT
        pci_direct_init();
 #endif