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
fedora core 6 1.2949 + vserver 2.2.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
51087a9
..
b21b6da
100644
(file)
--- a/
arch/i386/pci/init.c
+++ b/
arch/i386/pci/init.c
@@
-6,8
+6,13
@@
in the right sequence from here. */
static __init int pci_access_init(void)
{
in the right sequence from here. */
static __init int pci_access_init(void)
{
+ int type = 0;
+
+#ifdef CONFIG_PCI_DIRECT
+ type = pci_direct_probe();
+#endif
#ifdef CONFIG_PCI_MMCONFIG
#ifdef CONFIG_PCI_MMCONFIG
- pci_mmcfg_init();
+ pci_mmcfg_init(
type
);
#endif
if (raw_pci_ops)
return 0;
#endif
if (raw_pci_ops)
return 0;
@@
-21,8
+26,12
@@
static __init int pci_access_init(void)
* fails.
*/
#ifdef CONFIG_PCI_DIRECT
* fails.
*/
#ifdef CONFIG_PCI_DIRECT
- pci_direct_init();
+ pci_direct_init(
type
);
#endif
#endif
+ if (!raw_pci_ops)
+ printk(KERN_ERR
+ "PCI: Fatal: No config space access function found\n");
+
return 0;
}
arch_initcall(pci_access_init);
return 0;
}
arch_initcall(pci_access_init);