Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / irqinit_32.c

diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c
index 9092103a18eb16d7c88ab430acbb6208e75800e5..845aa9803e804edd7cdc6ef5bb61e2db72f1a911 100644 (file)
--- a/arch/x86/kernel/irqinit_32.c
+++ b/arch/x86/kernel/irqinit_32.c
@@ -70,7 +70,7 @@ void __init init_ISA_irqs (void)
         */
        for (i = 0; i < 16; i++) {
                /* first time call this irq_desc */
-               struct irq_desc *desc = irq_to_desc_alloc(i);
+               struct irq_desc *desc = irq_to_desc(i);
 
                desc->status = IRQ_DISABLED;
                desc->action = NULL;
@@ -184,4 +184,3 @@ void __init native_init_IRQ(void)
 
        irq_ctx_init(smp_processor_id());
 }
-