Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

[~andy/linux] / drivers / gpio / pl061.c

diff --git a/drivers/gpio/pl061.c b/drivers/gpio/pl061.c
index 901e4e06b377f487128f9fc06e26395988fb1226..6fcb28cdd862af40527d79cb80b14393ae410d5d 100644 (file)
--- a/drivers/gpio/pl061.c
+++ b/drivers/gpio/pl061.c
@@ -315,8 +315,8 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id)
                else
                        pl061_direction_input(&chip->gc, i);
 
-               irq_set_chip(i + chip->irq_base, &pl061_irqchip);
-               irq_set_handler(i + chip->irq_base, handle_simple_irq);
+               irq_set_chip_and_handler(i + chip->irq_base, &pl061_irqchip,
+                                        handle_simple_irq);
                set_irq_flags(i+chip->irq_base, IRQF_VALID);
                irq_set_chip_data(i + chip->irq_base, chip);
        }