diff --git a/[refs] b/[refs] index 2cd5fe3b4f6d..70dd36b68d7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f8349e6e98ba0455437724589072523865eae5e +refs/heads/master: b8b8d7932bb83300d0ae6553e320ab1aecb37990 diff --git a/trunk/drivers/mfd/twl6030-irq.c b/trunk/drivers/mfd/twl6030-irq.c index aa367a2c846c..3c2cc0082f57 100644 --- a/trunk/drivers/mfd/twl6030-irq.c +++ b/trunk/drivers/mfd/twl6030-irq.c @@ -236,7 +236,7 @@ static inline void activate_irq(int irq) #endif } -int twl6030_irq_set_wake(struct irq_data *d, unsigned int on) +static int twl6030_irq_set_wake(struct irq_data *d, unsigned int on) { if (on) atomic_inc(&twl6030_wakeirqs);