Merge branch 'pm-cpufreq'

[cascardo/linux.git] / arch / arm / plat-orion / gpio.c

diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index 4a347de..79c33ec 100644 (file)
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -407,9 +407,9 @@ static int gpio_irq_set_type(struct irq_data *d, u32 type)
        return 0;
 }
 
-static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)
+static void gpio_irq_handler(unsigned __irq, struct irq_desc *desc)
 {
-       struct orion_gpio_chip *ochip = irq_get_handler_data(irq);
+       struct orion_gpio_chip *ochip = irq_desc_get_handler_data(desc);
        u32 cause, type;
        int i;