From 31f9214090901348d674f9950312f5075eca8051 Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@SteelEye.com>
Date: Tue, 27 Jun 2006 02:53:50 -0700
Subject: [PATCH] --- yaml --- r: 30743 b: refs/heads/master c:
 d5fb34261dcd32c9cb3b28121fdc46308db513a1 h: refs/heads/master i:   30741:
 4cac129d8630948cdeb41d489721f70201eae4a5   30739:
 801a72d130262627eccc8567dd4f6fa8b22a9e2c   30735:
 3b728a53fd2d3cd3009f5740bbbc21cda7d28a5a v: v3

---
 [refs]                               | 2 +-
 trunk/arch/i386/mach-voyager/setup.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e821c52e9d6d..558ad1bb9f0f 100644
--- 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
index 0e225054e222..defc6ebbd565 100644
--- 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)