2 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c
index 8e40208b10bb..30e188109046 100644
--- a/arch/arm/mach-omap1/fpga.c
+++ b/arch/arm/mach-omap1/fpga.c
@@ -84,9 +84,9 @@ static void fpga_mask_ack_irq(unsigned int irq)
         fpga_ack_irq(irq);
 }
 
-void innovator_fpga_IRQ_demux(unsigned int irq, struct irqdesc *desc)
+void innovator_fpga_IRQ_demux(unsigned int irq, struct irq_desc *desc)
 {
-        struct irqdesc *d;
+        struct irq_desc *d;
         u32 stat;
         int fpga_irq;
 
@@ -168,7 +168,7 @@ void omap1510_fpga_init_irq(void)
                         set_irq_chip(i, &omap_fpga_irq);
                 }
 
-                set_irq_handler(i, do_edge_IRQ);
+                set_irq_handler(i, handle_edge_irq);
                 set_irq_flags(i, IRQF_VALID);
         }
 
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c
index 3ea140bb9eba..6383a12ad970 100644
--- a/arch/arm/mach-omap1/irq.c
+++ b/arch/arm/mach-omap1/irq.c
@@ -229,7 +229,7 @@ void __init omap_init_irq(void)
                         omap_irq_set_cfg(j, 0, 0, irq_trigger);
 
                         set_irq_chip(j, &omap_irq_chip);
-                        set_irq_handler(j, do_level_IRQ);
+                        set_irq_handler(j, handle_level_irq);
                         set_irq_flags(j, IRQF_VALID);
                 }
         }