From 18ffd8d81d22d49d907842b3892d2131c2eaad3a Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Mon, 14 Apr 2008 15:40:37 -0700
Subject: [PATCH] --- yaml --- r: 96023 b: refs/heads/master c:
 0df18ff366853cdf31e5238764ec5c63e6b5a398 h: refs/heads/master i:   96021:
 fa021afbc6261adbf93e1fab58de71eadb5853e1   96019:
 d37f60ceb9a8dea90702b6b52e54a4b33a2c52b4   96015:
 854bab70fe4d6ff572a690572ef5bb71a633e455 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/pci/common.c | 7 +++++--
 trunk/arch/x86/pci/init.c   | 2 ++
 trunk/arch/x86/pci/pci.h    | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b66775ed3067..3d025afddf01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13a6ddb08e58a1bd344da7898c4e2f13bdf18c2f
+refs/heads/master: 0df18ff366853cdf31e5238764ec5c63e6b5a398
diff --git a/trunk/arch/x86/pci/common.c b/trunk/arch/x86/pci/common.c
index a6d27797ef47..bfa72a9475b3 100644
--- a/trunk/arch/x86/pci/common.c
+++ b/trunk/arch/x86/pci/common.c
@@ -362,13 +362,16 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = {
 	{}
 };
 
+void __init dmi_check_pciprobe(void)
+{
+	dmi_check_system(pciprobe_dmi_table);
+}
+
 struct pci_bus * __devinit pcibios_scan_root(int busnum)
 {
 	struct pci_bus *bus = NULL;
 	struct pci_sysdata *sd;
 
-	dmi_check_system(pciprobe_dmi_table);
-
 	while ((bus = pci_find_next_bus(bus)) != NULL) {
 		if (bus->number == busnum) {
 			/* Already scanned */
diff --git a/trunk/arch/x86/pci/init.c b/trunk/arch/x86/pci/init.c
index b394b2a4b912..e70b9c57b88e 100644
--- a/trunk/arch/x86/pci/init.c
+++ b/trunk/arch/x86/pci/init.c
@@ -33,6 +33,8 @@ static __init int pci_access_init(void)
 		printk(KERN_ERR
 		"PCI: Fatal: No config space access function found\n");
 
+	dmi_check_pciprobe();
+
 	dmi_check_skip_isa_align();
 
 	return 0;
diff --git a/trunk/arch/x86/pci/pci.h b/trunk/arch/x86/pci/pci.h
index 101982027881..f3972b12c60a 100644
--- a/trunk/arch/x86/pci/pci.h
+++ b/trunk/arch/x86/pci/pci.h
@@ -38,6 +38,7 @@ enum pci_bf_sort_state {
 	pci_dmi_bf,
 };
 
+extern void __init dmi_check_pciprobe(void);
 extern void __init dmi_check_skip_isa_align(void);
 
 /* pci-i386.c */