x86: Move pre_intr_init to x86_init_ops

[pandora-kernel.git] / arch / x86 / kernel / x86_init.c

diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 3488fb6..f2abe21 100644 (file)
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -9,6 +9,7 @@
 #include <asm/mpspec.h>
 #include <asm/setup.h>
 #include <asm/e820.h>
+#include <asm/irq.h>
 
 void __cpuinit x86_init_noop(void) { }
 void __init x86_init_uint_noop(unsigned int unused) { }
@@ -35,4 +36,8 @@ struct __initdata x86_init_ops x86_init = {
                .find_smp_config        = default_find_smp_config,
                .get_smp_config         = default_get_smp_config,
        },
+
+       .irqs = {
+               .pre_vector_init        = init_ISA_irqs,
+       },
 };