diff --git a/[refs] b/[refs]
index 341ca878246f..63a08ba1159e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4191894b68a85bd8da935fb9ac4c882a1fa8651c
+refs/heads/master: 8bfaba873f0cc81c1747d6787f2721926192a3dc
diff --git a/trunk/include/asm-x86/irq_vectors.h b/trunk/include/asm-x86/irq_vectors.h
index b58581e2e24e..0ac864ef3cd4 100644
--- a/trunk/include/asm-x86/irq_vectors.h
+++ b/trunk/include/asm-x86/irq_vectors.h
@@ -107,9 +107,9 @@
 #define LAST_VM86_IRQ		15
 #define invalid_vm86_irq(irq)	((irq) < 3 || (irq) > 15)
 
-#if !defined(CONFIG_X86_VISWS) && !defined(CONFIG_X86_VOYAGER)
+#if !defined(CONFIG_X86_VOYAGER)
 
-# if defined(CONFIG_X86_IO_APIC) || defined(CONFIG_PARAVIRT)
+# if defined(CONFIG_X86_IO_APIC) || defined(CONFIG_PARAVIRT) || defined(CONFIG_X86_VISWS)
 
 #  define NR_IRQS		224