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 #include #include -#include #include #include #include +#include #include 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)