diff options
| author | Mark Brown <broonie@kernel.org> | 2015-09-25 10:01:09 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-25 10:01:09 -0700 |
| commit | 536b5603e7a3c75c7d2e0c1c56980690909b12d3 (patch) | |
| tree | c48d8fe596cf3e6a3392d9688c27cd695d90a23a /arch/arm/mach-pxa/viper.c | |
| parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) | |
| parent | b4fe8ba7a310da6a2b99e3abe67c7815198cde49 (diff) | |
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/arm/mach-pxa/viper.c')
| -rw-r--r-- | arch/arm/mach-pxa/viper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c index 4841d6cefe76..8ab26370107e 100644 --- a/arch/arm/mach-pxa/viper.c +++ b/arch/arm/mach-pxa/viper.c @@ -276,7 +276,7 @@ static inline unsigned long viper_irq_pending(void) viper_irq_enabled_mask; } -static void viper_irq_handler(unsigned int __irq, struct irq_desc *desc) +static void viper_irq_handler(struct irq_desc *desc) { unsigned int irq; unsigned long pending; |