[PATCH] voyager: fix compile after setup rework

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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
James Bottomley 2006-06-27 02:53:50 -07:00 committed by Linus Torvalds
parent 96c5274903
commit d5fb34261d

View File

@ -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)