---

yaml --- r: 96023 b: refs/heads/master c: 0df18ff h: refs/heads/master i: 96021: fa021af 96019: d37f60c 96015: 854bab7 v: v3
git-mirror · May 5, 2008 · 18ffd8d · 18ffd8d
1 parent c11ab26
commit 18ffd8d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 */