From 0eb4fd0191e46201e7a55a8260ea2d3d66f8c3b8 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Thu, 5 Oct 2006 18:47:22 +0200
Subject: [PATCH] --- yaml --- r: 39019 b: refs/heads/master c:
 f015c6c4d733f68cbc1c5d231bb158abaa5c9606 h: refs/heads/master i:   39017:
 d36a9d64602f335639168c387b9b39ca2fcbd19f   39015:
 9ba6926c436f03dca1dd813c1e7ae0d53ea8a9f3 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/i386/pci/direct.c | 2 ++
 trunk/arch/i386/pci/init.c   | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fd6cd0a97086..af337607b4a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70d666d6ae9724c0a08434c20f8830c90a635bd3
+refs/heads/master: f015c6c4d733f68cbc1c5d231bb158abaa5c9606
diff --git a/trunk/arch/i386/pci/direct.c b/trunk/arch/i386/pci/direct.c
index 5acf0b4743cf..431c9a51b157 100644
--- a/trunk/arch/i386/pci/direct.c
+++ b/trunk/arch/i386/pci/direct.c
@@ -256,6 +256,8 @@ static int __init pci_check_type2(void)
 
 void __init pci_direct_init(int type)
 {
+	if (type == 0)
+		return;
 	printk(KERN_INFO "PCI: Using configuration type %d\n", type);
 	if (type == 1)
 		raw_pci_ops = &pci_direct_conf1;
diff --git a/trunk/arch/i386/pci/init.c b/trunk/arch/i386/pci/init.c
index d028e1b05c36..b21b6da8ab1d 100644
--- a/trunk/arch/i386/pci/init.c
+++ b/trunk/arch/i386/pci/init.c
@@ -28,6 +28,10 @@ static __init int pci_access_init(void)
 #ifdef CONFIG_PCI_DIRECT
 	pci_direct_init(type);
 #endif
+	if (!raw_pci_ops)
+		printk(KERN_ERR
+		"PCI: Fatal: No config space access function found\n");
+
 	return 0;
 }
 arch_initcall(pci_access_init);