diff --git a/[refs] b/[refs]
index bafdab234e34..e74b8ddc2a7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e331bf1c44401a5b6d7b778dd1f254724132dff
+refs/heads/master: 23a36002742bca87510201770a7d931c4aa63e97
diff --git a/trunk/arch/x86/pci/init.c b/trunk/arch/x86/pci/init.c
index bec3b048e72b..25a1f8efed4a 100644
--- a/trunk/arch/x86/pci/init.c
+++ b/trunk/arch/x86/pci/init.c
@@ -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())