summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/irq_vectors.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-31 02:21:42 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-31 04:21:22 +0100
commit3e92ab3d7e2edef5dccd8b0db21528699c81d2c0 (patch)
tree09616446524f80e9156d928e0e267426617258f0 /arch/x86/include/asm/irq_vectors.h
parented74ca6d5a3e57eb0969d4e14e46cf9f88d25d3f (diff)
x86, irqs, voyager: remove Voyager quirk
Remove a Voyager complication from the generic irq_vectors.h header. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/irq_vectors.h')
-rw-r--r--arch/x86/include/asm/irq_vectors.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/arch/x86/include/asm/irq_vectors.h b/arch/x86/include/asm/irq_vectors.h
index 067d22ffb3ec..81fc883b3c05 100644
--- a/arch/x86/include/asm/irq_vectors.h
+++ b/arch/x86/include/asm/irq_vectors.h
@@ -106,7 +106,7 @@
#define NR_IRQS_LEGACY 16
-#if defined(CONFIG_X86_IO_APIC) && !defined(CONFIG_X86_VOYAGER)
+#ifdef CONFIG_X86_IO_APIC
#include <asm/apicnum.h> /* need MAX_IO_APICS */
@@ -117,22 +117,14 @@
# define NR_IRQS (NR_VECTORS + (32 * MAX_IO_APICS))
# endif
#else
-
# define NR_IRQS \
((8 * NR_CPUS) > (32 * MAX_IO_APICS) ? \
(NR_VECTORS + (8 * NR_CPUS)) : \
- (NR_VECTORS + (32 * MAX_IO_APICS))) \
-
+ (NR_VECTORS + (32 * MAX_IO_APICS)))
#endif
-#elif defined(CONFIG_X86_VOYAGER)
-
-# define NR_IRQS 224
-
-#else /* IO_APIC || VOYAGER */
-
+#else /* !CONFIG_X86_IO_APIC: */
# define NR_IRQS 16
-
#endif
#endif /* _ASM_X86_IRQ_VECTORS_H */