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

[mv-sheeva.git] / arch / x86 / pci / init.c

diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c
index d6c950f818585aea6df65e38e18c2f85ab217941..25a1f8efed4a0f40004c8ca1c8d8586c81d36d14 100644 (file)
--- a/arch/x86/pci/init.c
+++ b/arch/x86/pci/init.c
@@ -1,6 +1,6 @@
 #include <linux/pci.h>
 #include <linux/init.h>
-#include "pci.h"
+#include <asm/pci_x86.h>
 
 /* arch_initcall has too random ordering, so call the initializers
    in the right sequence from here. */
@@ -12,7 +12,8 @@ static __init int pci_arch_init(void)
        type = pci_direct_probe();
 #endif
 
-       pci_mmcfg_early_init();
+       if (!(pci_probe & PCI_PROBE_NOEARLY))
+               pci_mmcfg_early_init();
 
 #ifdef CONFIG_PCI_OLPC
        if (!pci_olpc_init())