From 03b4815f57e4f2e62633e0cd7503d5d5ef7a6e95 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Fri, 7 Apr 2006 19:49:36 +0200
Subject: [PATCH] --- yaml --- r: 25327 b: refs/heads/master c:
 ec0f08eeea6ac1d8c925f47e3677e4c985fd8f63 h: refs/heads/master i:   25325:
 6c077d5b7a28ce5d62249ce19cd3cffdd68beece   25323:
 a6ee9db02bf49731e1a7dda75a568d0f6df3167a   25319:
 6e8843417ba324fb7b5325c2726d2f4b22092fc5   25311:
 8a1bbad8356d73d4cc6dbcffbc7cfb5f03be9da5 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/i386/pci/direct.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3ddb79d30565..13ea9861cee1 100644
--- 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
index 99012b93bd12..4457cf3eb401 100644
--- 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))