aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/pci/common.c7
-rw-r--r--arch/x86/pci/init.c2
-rw-r--r--arch/x86/pci/pci.h1
3 files changed, 8 insertions, 2 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index a6d27797ef47..bfa72a9475b3 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -362,13 +362,16 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = {
362 {} 362 {}
363}; 363};
364 364
365void __init dmi_check_pciprobe(void)
366{
367 dmi_check_system(pciprobe_dmi_table);
368}
369
365struct pci_bus * __devinit pcibios_scan_root(int busnum) 370struct pci_bus * __devinit pcibios_scan_root(int busnum)
366{ 371{
367 struct pci_bus *bus = NULL; 372 struct pci_bus *bus = NULL;
368 struct pci_sysdata *sd; 373 struct pci_sysdata *sd;
369 374
370 dmi_check_system(pciprobe_dmi_table);
371
372 while ((bus = pci_find_next_bus(bus)) != NULL) { 375 while ((bus = pci_find_next_bus(bus)) != NULL) {
373 if (bus->number == busnum) { 376 if (bus->number == busnum) {
374 /* Already scanned */ 377 /* Already scanned */
diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c
index b394b2a4b912..e70b9c57b88e 100644
--- a/arch/x86/pci/init.c
+++ b/arch/x86/pci/init.c
@@ -33,6 +33,8 @@ static __init int pci_access_init(void)
33 printk(KERN_ERR 33 printk(KERN_ERR
34 "PCI: Fatal: No config space access function found\n"); 34 "PCI: Fatal: No config space access function found\n");
35 35
36 dmi_check_pciprobe();
37
36 dmi_check_skip_isa_align(); 38 dmi_check_skip_isa_align();
37 39
38 return 0; 40 return 0;
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h
index 101982027881..f3972b12c60a 100644
--- a/arch/x86/pci/pci.h
+++ b/arch/x86/pci/pci.h
@@ -38,6 +38,7 @@ enum pci_bf_sort_state {
38 pci_dmi_bf, 38 pci_dmi_bf,
39}; 39};
40 40
41extern void __init dmi_check_pciprobe(void);
41extern void __init dmi_check_skip_isa_align(void); 42extern void __init dmi_check_skip_isa_align(void);
42 43
43/* pci-i386.c */ 44/* pci-i386.c */