summaryrefslogtreecommitdiff
path: root/drivers/gpio/gpio-msm-v2.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2015-10-25 12:38:20 +0200
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2015-10-25 12:38:20 +0200
commit10d15322ed26652263a579bcb59dfd49ab8a30de (patch)
treeb1497de1b8ffd34b991cdf6e21de1c7a0a65f1de /drivers/gpio/gpio-msm-v2.c
parent0316d30ea3e66379cd30ed70a114bc282159bb4c (diff)
parente5a9f8d04660da7ef3a98260aa74c3976f9cb4cd (diff)
downloadlinux-10d15322ed26652263a579bcb59dfd49ab8a30de.tar.gz
linux-10d15322ed26652263a579bcb59dfd49ab8a30de.tar.xz
Merge remote-tracking branch 'mac80211-next/master' into next
Diffstat (limited to 'drivers/gpio/gpio-msm-v2.c')
-rw-r--r--drivers/gpio/gpio-msm-v2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-msm-v2.c b/drivers/gpio/gpio-msm-v2.c
index d2012cfb5571..4b4222145f10 100644
--- a/drivers/gpio/gpio-msm-v2.c
+++ b/drivers/gpio/gpio-msm-v2.c
@@ -305,7 +305,7 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int flow_type)
* which have been set as summary IRQ lines and which are triggered,
* and to call their interrupt handlers.
*/
-static void msm_summary_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void msm_summary_irq_handler(struct irq_desc *desc)
{
unsigned long i;
struct irq_chip *chip = irq_desc_get_chip(desc);