Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / arch / x86 / pci / init.c

diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c
index 343c363..b821f44 100644 (file)
--- a/arch/x86/pci/init.c
+++ b/arch/x86/pci/init.c
@@ -11,8 +11,13 @@ static __init int pci_access_init(void)
 
        type = pci_direct_probe();
 #endif
+
        pci_mmcfg_early_init();
 
+#ifdef CONFIG_PCI_OLPC
+       if (!pci_olpc_init())
+               return 0;       /* skip additional checks if it's an XO */
+#endif
 #ifdef CONFIG_PCI_BIOS
        pci_pcbios_init();
 #endif
@@ -29,6 +34,10 @@ static __init int pci_access_init(void)
                printk(KERN_ERR
                "PCI: Fatal: No config space access function found\n");
 
+       dmi_check_pciprobe();
+
+       dmi_check_skip_isa_align();
+
        return 0;
 }
 arch_initcall(pci_access_init);