Merge branch 'for-linus' of git://neil.brown.name/md

[deliverable/linux.git] / drivers / mfd / twl4030-irq.c

diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
index b10876036983e241974bc36fa8638850fc9245b7..bae61b22501c2948e60a03cba0c07b4731b1254b 100644 (file)
--- a/drivers/mfd/twl4030-irq.c
+++ b/drivers/mfd/twl4030-irq.c
@@ -182,7 +182,7 @@ static int twl4030_irq_thread(void *data)
        long irq = (long)data;
        struct irq_desc *desc = irq_to_desc(irq);
        static unsigned i2c_errors;
-       const static unsigned max_i2c_errors = 100;
+       static const unsigned max_i2c_errors = 100;
 
        if (!desc) {
                pr_err("twl4030: Invalid IRQ: %ld\n", irq);
@@ -255,7 +255,7 @@ static int twl4030_irq_thread(void *data)
  * thread.  All we do here is acknowledge and mask the interrupt and wakeup
  * the kernel thread.
  */
-static void handle_twl4030_pih(unsigned int irq, irq_desc_t *desc)
+static void handle_twl4030_pih(unsigned int irq, struct irq_desc *desc)
 {
        /* Acknowledge, clear *AND* mask the interrupt... */
        desc->chip->ack(irq);