patch-2.4.27 linux-2.4.27/arch/i386/kernel/i8259.c

• Lines: 18
• Date: 2004-08-07 16:26:04.548342422 -0700
• Orig file: linux-2.4.26/arch/i386/kernel/i8259.c
• Orig date: 2001-09-17 23:03:09.000000000 -0700

diff -urN linux-2.4.26/arch/i386/kernel/i8259.c linux-2.4.27/arch/i386/kernel/i8259.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/kernel_stat.h>
 
+#include <asm/acpi.h>
 #include <asm/atomic.h>
 #include <asm/system.h>
 #include <asm/io.h>
@@ -498,7 +499,8 @@
 	outb(LATCH >> 8 , 0x40);	/* MSB */
 
 #ifndef CONFIG_VISWS
-	setup_irq(2, &irq2);
+	if (!acpi_ioapic)
+		setup_irq(2, &irq2);
 #endif
 
 	/*