[PATCH] voyager: fix compile after setup rework

[James Bottomley <James.Bottomley@SteelEye.com>]

The following

[PATCH] Clean up and refactor i386 sub-architecture setup

Doesn't quite work, since it leaves out an include of asm/io.h, without
which the use of inb/outb in the setup file won.t work.  This corrects
that and also removes a spurious acpi reference that apparently crept in
ages ago but should never have been there.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

---

James

Index: linux-2.6/arch/i386/mach-voyager/setup.c
===================================================================
--- linux-2.6.orig/arch/i386/mach-voyager/setup.c	2006-06-26 10:56:43.000000000 -0500
+++ linux-2.6/arch/i386/mach-voyager/setup.c	2006-06-26 11:29:50.000000000 -0500
@@ -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 @@
 	smp_intr_init();
 #endif
 
-	if (!acpi_ioapic)
-		setup_irq(2, &irq2);
+	setup_irq(2, &irq2);
 }
 
 void __init pre_setup_arch_hook(void)


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/