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/m68k/mac/psc.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/m68k/mac/psc.c')
| -rw-r--r-- | arch/m68k/mac/psc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c index 3b9e302e7a37..cd38f29955c8 100644 --- a/arch/m68k/mac/psc.c +++ b/arch/m68k/mac/psc.c @@ -113,7 +113,7 @@ void __init psc_init(void) * PSC interrupt handler. It's a lot like the VIA interrupt handler. */ -static void psc_irq(unsigned int __irq, struct irq_desc *desc) +static void psc_irq(struct irq_desc *desc) { unsigned int offset = (unsigned int)irq_desc_get_handler_data(desc); unsigned int irq = irq_desc_get_irq(desc); |