Merge branch 'master' into next

[u-boot] / lib_i386 / interrupts.c

diff --git a/lib_i386/interrupts.c b/lib_i386/interrupts.c
index b0f84de4eb5e7ef3e2afe04768c9c29e98411bf4..51def59954c2d2525f535c04f5e1351e710b36b5 100644 (file)
--- a/lib_i386/interrupts.c
+++ b/lib_i386/interrupts.c
@@ -109,8 +109,10 @@ void irq_free_handler(int irq)
        return;
 }
 
-__isr__ do_irq(int irq)
+void do_irq(int hw_irq)
 {
+       int irq = hw_irq - 0x20;
+
        if (irq < 0 || irq >= CONFIG_SYS_NUM_IRQS) {
                printf("do_irq: bad irq number %d\n", irq);
                return;