V4L/DVB (11100): au8522: fix compilation warning.

[safe/jmp/linux-2.6] / arch / x86 / pci / legacy.c

diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c
index 3c1d795..f1065b1 100644 (file)
--- a/arch/x86/pci/legacy.c
+++ b/arch/x86/pci/legacy.c
@@ -3,7 +3,7 @@
  */
 #include <linux/init.h>
 #include <linux/pci.h>
-#include "pci.h"
+#include <asm/pci_x86.h>
 
 /*
  * Discover remaining PCI buses in case there are peer host bridges.
@@ -14,7 +14,7 @@ static void __devinit pcibios_fixup_peer_bridges(void)
        int n, devfn;
        long node;
 
-       if (pcibios_last_bus <= 0 || pcibios_last_bus >= 0xff)
+       if (pcibios_last_bus <= 0 || pcibios_last_bus > 0xff)
                return;
        DBG("PCI: Peer bridge fixup\n");
 
@@ -57,11 +57,19 @@ static int __init pci_legacy_init(void)
 
 int __init pci_subsys_init(void)
 {
+#ifdef CONFIG_X86_NUMAQ
+       pci_numaq_init();
+#endif
 #ifdef CONFIG_ACPI
        pci_acpi_init();
 #endif
+#ifdef CONFIG_X86_VISWS
+       pci_visws_init();
+#endif
        pci_legacy_init();
        pcibios_irq_init();
        pcibios_init();
+
+       return 0;
 }
 subsys_initcall(pci_subsys_init);