---

yaml --- r: 127361 b: refs/heads/master c: 23a3600 h: refs/heads/master i: 127359: 3da4efa v: v3
git-mirror · Jan 7, 2009 · 6bfe8ef · 6bfe8ef
1 parent 915298e
commit 6bfe8ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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())