From: Andrew Morton <akpm@osdl.org>

This broke Dave Hansen's machine.  Subject: aic7xxx broken in 2.6.18-rc3-mm2

Cc: Greg KH <greg@kroah.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/pci/init.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff -puN arch/i386/pci/init.c~revert-gregkh-pci-pci-use-pci_bios-as-last-fallback arch/i386/pci/init.c
--- a/arch/i386/pci/init.c~revert-gregkh-pci-pci-use-pci_bios-as-last-fallback
+++ a/arch/i386/pci/init.c
@@ -11,14 +11,14 @@ static __init int pci_access_init(void)
 #endif
 	if (raw_pci_ops)
 		return 0;
-#ifdef CONFIG_PCI_DIRECT
-	pci_direct_init();
-	if (raw_pci_ops)
-		return 0;
-#endif
 #ifdef CONFIG_PCI_BIOS
 	pci_pcbios_init();
 #endif
+	if (raw_pci_ops)
+		return 0;
+#ifdef CONFIG_PCI_DIRECT
+	pci_direct_init();
+#endif
 	return 0;
 }
 arch_initcall(pci_access_init);
_