1 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c
index 0f109e179cbb..423ddb3d65e9 100644
--- a/arch/arm/mach-sa1100/irq.c
+++ b/arch/arm/mach-sa1100/irq.c
@@ -323,20 +323,20 @@ void __init sa1100_init_irq(void)
         ICCR = 1;
 
         for (irq = 0; irq <= 10; irq++) {
-                irq_set_chip(irq, &sa1100_low_gpio_chip);
-                irq_set_handler(irq, handle_edge_irq);
+                irq_set_chip_and_handler(irq, &sa1100_low_gpio_chip,
+                                         handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
         for (irq = 12; irq <= 31; irq++) {
-                irq_set_chip(irq, &sa1100_normal_chip);
-                irq_set_handler(irq, handle_level_irq);
+                irq_set_chip_and_handler(irq, &sa1100_normal_chip,
+                                         handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID);
         }
 
         for (irq = 32; irq <= 48; irq++) {
-                irq_set_chip(irq, &sa1100_high_gpio_chip);
-                irq_set_handler(irq, handle_edge_irq);
+                irq_set_chip_and_handler(irq, &sa1100_high_gpio_chip,
+                                         handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }