summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-orion/gpio.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/arm/plat-orion/gpio.c
parentMerge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentMerge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff)
downloadlinux-6afc0c269c3d20cde05515b00ede00e91fee0be5.tar.xz
linux-6afc0c269c3d20cde05515b00ede00e91fee0be5.zip
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/arm/plat-orion/gpio.c')
-rw-r--r--arch/arm/plat-orion/gpio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index 79c33eca09a3..7bd22d8e5b11 100644
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -407,7 +407,7 @@ static int gpio_irq_set_type(struct irq_data *d, u32 type)
return 0;
}
-static void gpio_irq_handler(unsigned __irq, struct irq_desc *desc)
+static void gpio_irq_handler(struct irq_desc *desc)
{
struct orion_gpio_chip *ochip = irq_desc_get_handler_data(desc);
u32 cause, type;