git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
pci
/
init.c
diff --git
a/arch/x86/pci/init.c
b/arch/x86/pci/init.c
index bec3b048e72b6b0148efad321b6c24279b73e8df..25a1f8efed4a0f40004c8ca1c8d8586c81d36d14 100644
(file)
--- a/
arch/x86/pci/init.c
+++ b/
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())