diff options
| author | Mark Brown <broonie@kernel.org> | 2015-09-25 20:01:09 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-25 20:01:09 +0300 |
| commit | 536b5603e7a3c75c7d2e0c1c56980690909b12d3 (patch) | |
| tree | c48d8fe596cf3e6a3392d9688c27cd695d90a23a /arch/sh/boards/mach-x3proto | |
| parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) | |
| parent | b4fe8ba7a310da6a2b99e3abe67c7815198cde49 (diff) | |
| download | linux-536b5603e7a3c75c7d2e0c1c56980690909b12d3.tar.xz | |
Merge tag 'ib-mfd-regmap-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regmap-irq-hdr
Immutable branch between MFD and Regmap due for v4.3
Diffstat (limited to 'arch/sh/boards/mach-x3proto')
| -rw-r--r-- | arch/sh/boards/mach-x3proto/gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-x3proto/gpio.c b/arch/sh/boards/mach-x3proto/gpio.c index 24555c364d5b..1fb2cbee25f2 100644 --- a/arch/sh/boards/mach-x3proto/gpio.c +++ b/arch/sh/boards/mach-x3proto/gpio.c @@ -60,7 +60,7 @@ static int x3proto_gpio_to_irq(struct gpio_chip *chip, unsigned gpio) return virq; } -static void x3proto_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) +static void x3proto_gpio_irq_handler(struct irq_desc *desc) { struct irq_data *data = irq_desc_get_irq_data(desc); struct irq_chip *chip = irq_data_get_irq_chip(data); |