[PATCH] MSI build fixes

Add missing NR_VECTORS definition to visws and pc9800.  Also, make MSI
support dependent on CONFIG_X86_IO_APIC, as it won't build without IOAPIC
support.

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index de830f5b8102fbb7beb3b7ef28de8bae3c74fee5..3217c7b98a62dc14c86726373d3d35c1f351ea20 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -1056,7 +1056,7 @@ config PCI_DIRECT
 
 config PCI_USE_VECTOR
        bool "Vector-based interrupt indexing"
-       depends on X86_LOCAL_APIC
+       depends on X86_LOCAL_APIC && X86_IO_APIC
        default n
        help
           This replaces the current existing IRQ-based index interrupt scheme

diff --git a/include/asm-i386/mach-pc9800/irq_vectors.h b/include/asm-i386/mach-pc9800/irq_vectors.h
index 60326903f56309276bc4184a1fd210b4b44bf75c..8d9a0fa37796fbc9080bc1f606c2fa1f289d3b46 100644 (file)
--- a/include/asm-i386/mach-pc9800/irq_vectors.h
+++ b/include/asm-i386/mach-pc9800/irq_vectors.h
@@ -85,6 +85,7 @@
 #define NR_IRQS 16
 #endif
 
+#define NR_VECTORS 256
 #define NR_IRQ_VECTORS NR_IRQS
 
 #define FPU_IRQ                        8

diff --git a/include/asm-i386/mach-visws/irq_vectors.h b/include/asm-i386/mach-visws/irq_vectors.h
index eae621e653bc10e20c30130676aa3a410fdb9f89..cb572d8db5051efe7781ba495a8fdac5b3e24b63 100644 (file)
--- a/include/asm-i386/mach-visws/irq_vectors.h
+++ b/include/asm-i386/mach-visws/irq_vectors.h
@@ -47,8 +47,9 @@
 #define TIMER_IRQ 0
 
 /*
- * 
+ * IRQ definitions
  */
+#define NR_VECTORS 256
 #define NR_IRQS 224
 #define NR_IRQ_VECTORS NR_IRQS