---

yaml --- r: 30743 b: refs/heads/master c: d5fb342 h: refs/heads/master i: 30741: 4cac129 30739: 801a72d 30735: 3b728a5 v: v3
git-mirror · Jun 28, 2006 · 31f9214 · 31f9214
1 parent de645d3
commit 31f9214
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96c52749036eca2b131f435d3895a3c6aba92e76
+refs/heads/master: d5fb34261dcd32c9cb3b28121fdc46308db513a1
diff --git a/trunk/arch/i386/mach-voyager/setup.c b/trunk/arch/i386/mach-voyager/setup.c
@@ -5,10 +5,10 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <asm/acpi.h>
 #include <asm/arch_hooks.h>
 #include <asm/voyager.h>
 #include <asm/e820.h>
+#include <asm/io.h>
 #include <asm/setup.h>
 
 void __init pre_intr_init_hook(void)
@@ -27,8 +27,7 @@ void __init intr_init_hook(void)
 	smp_intr_init();
 #endif
 
-	if (!acpi_ioapic)
-		setup_irq(2, &irq2);
+	setup_irq(2, &irq2);
 }
 
 void __init pre_setup_arch_hook(void)