diff options
author | Mark Brown <broonie@kernel.org> | 2015-10-05 18:17:08 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-10-05 18:17:08 +0300 |
commit | c2f4160b77f1e12b2c05f2253575617faf0c69d0 (patch) | |
tree | a04ab897d2bc2a756d8ef780684538bb993ff4ab /arch/arm/mach-gemini/gpio.c | |
parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) | |
parent | 7e50711993552800644a4667daa0f569a7665eca (diff) | |
download | linux-c2f4160b77f1e12b2c05f2253575617faf0c69d0.tar.xz |
Merge tag 'ib-mfd-regulator-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-tps6105x
Immutable branch between MFD and Regulator due for v4.3
Diffstat (limited to 'arch/arm/mach-gemini/gpio.c')
-rw-r--r-- | arch/arm/mach-gemini/gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-gemini/gpio.c b/arch/arm/mach-gemini/gpio.c index 220333ed741d..2478d9f4d92d 100644 --- a/arch/arm/mach-gemini/gpio.c +++ b/arch/arm/mach-gemini/gpio.c @@ -126,7 +126,7 @@ static int gpio_set_irq_type(struct irq_data *d, unsigned int type) return 0; } -static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc) +static void gpio_irq_handler(struct irq_desc *desc) { unsigned int port = (unsigned int)irq_desc_get_handler_data(desc); unsigned int gpio_irq_no, irq_stat; |