git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
i386
/
pci
/
init.c
diff --git
a/arch/i386/pci/init.c
b/arch/i386/pci/init.c
index
f9156d3
..
51087a9
100644
(file)
--- a/
arch/i386/pci/init.c
+++ b/
arch/i386/pci/init.c
@@
-1,4
+1,3
@@
-#include <linux/config.h>
#include <linux/pci.h>
#include <linux/init.h>
#include "pci.h"
#include <linux/pci.h>
#include <linux/init.h>
#include "pci.h"
@@
-15,8
+14,12
@@
static __init int pci_access_init(void)
#ifdef CONFIG_PCI_BIOS
pci_pcbios_init();
#endif
#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
#ifdef CONFIG_PCI_DIRECT
pci_direct_init();
#endif