---

yaml --- r: 136672 b: refs/heads/master c: 3e92ab3 h: refs/heads/master v: v3
git-mirror · Jan 31, 2009 · 0c074d4 · 0c074d4
1 parent 74e4fd1
commit 0c074d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed74ca6d5a3e57eb0969d4e14e46cf9f88d25d3f
+refs/heads/master: 3e92ab3d7e2edef5dccd8b0db21528699c81d2c0
diff --git a/trunk/arch/x86/include/asm/irq_vectors.h b/trunk/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 */