summaryrefslogtreecommitdiff
path: root/arch/m68k/mac/baboon.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-09-28 08:06:57 +0200
committerIngo Molnar <mingo@kernel.org>2015-09-28 08:06:57 +0200
commit6afc0c269c3d20cde05515b00ede00e91fee0be5 (patch)
treed54e7fa59df16bb62902129dfd28956d9ae1be19 /arch/m68k/mac/baboon.c
parent968d712a2565121b269e1037a1517916a9769423 (diff)
parent097f70b3c4d84ffccca15195bdfde3a37c0a7c0f (diff)
Merge branch 'linus' into perf/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/m68k/mac/baboon.c')
-rw-r--r--arch/m68k/mac/baboon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c
index 3fe0e43d44f6..f6f7d42713ec 100644
--- a/arch/m68k/mac/baboon.c
+++ b/arch/m68k/mac/baboon.c
@@ -45,7 +45,7 @@ void __init baboon_init(void)
* Baboon interrupt handler. This works a lot like a VIA.
*/
-static void baboon_irq(unsigned int irq, struct irq_desc *desc)
+static void baboon_irq(struct irq_desc *desc)
{
int irq_bit, irq_num;
unsigned char events;