Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[linux-2.6-omap-h63xx.git] / arch / x86 / pci / init.c

diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c
index 343c36337e69237dd27d24e14704c6386df7da61..dd30c6076b5d74ff1be2929d7b8f84081c6a8250 100644 (file)
--- a/arch/x86/pci/init.c
+++ b/arch/x86/pci/init.c
@@ -11,8 +11,12 @@ static __init int pci_access_init(void)
 
        type = pci_direct_probe();
 #endif
+
        pci_mmcfg_early_init();
 
+#ifdef CONFIG_PCI_OLPC
+       pci_olpc_init();
+#endif
 #ifdef CONFIG_PCI_BIOS
        pci_pcbios_init();
 #endif