diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-01-06 15:52:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2004-01-06 15:52:12 -0800 |
| commit | dc8d3e6090b5f715d59dc478f08a6aa706eee774 (patch) | |
| tree | dbdfb518e6e97b3fc6f2c8476e9d3f859431ee1b | |
| parent | 0e00c9efc00ceda5eb83c7799a49d9a22e6c3ed4 (diff) | |
[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.
| -rw-r--r-- | arch/i386/Kconfig | 2 | ||||
| -rw-r--r-- | include/asm-i386/mach-pc9800/irq_vectors.h | 1 | ||||
| -rw-r--r-- | include/asm-i386/mach-visws/irq_vectors.h | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index de830f5b8102..3217c7b98a62 100644 --- 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 60326903f563..8d9a0fa37796 100644 --- 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 eae621e653bc..cb572d8db505 100644 --- 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 |