---

yaml --- r: 25327 b: refs/heads/master c: ec0f08e h: refs/heads/master i: 25325: 6c077d5 25323: a6ee9db 25319: 6e88434 25311: 8a1bbad v: v3
git-mirror · Apr 9, 2006 · 03b4815 · 03b4815
1 parent adb904e
commit 03b4815
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa47dd0ba303599f8adf8d8336ed2fb74efc47c5
+refs/heads/master: ec0f08eeea6ac1d8c925f47e3677e4c985fd8f63
diff --git a/trunk/arch/i386/pci/direct.c b/trunk/arch/i386/pci/direct.c
@@ -4,6 +4,7 @@
 
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/dmi.h>
 #include "pci.h"
 
 /*
@@ -188,6 +189,10 @@ static int __init pci_sanity_check(struct pci_raw_ops *o)
 
 	if (pci_probe & PCI_NO_CHECKS)
 		return 1;
+	/* Assume Type 1 works for newer systems.
+	   This handles machines that don't have anything on PCI Bus 0. */
+	if (dmi_get_year(DMI_BIOS_DATE) >= 2001)
+		return 1;
 
 	for (devfn = 0; devfn < 0x100; devfn++) {
 		if (o->read(0, 0, devfn, PCI_CLASS_DEVICE, 2, &x))