summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/balloon3.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-10-01 01:21:11 +0300
committerMark Brown <broonie@kernel.org>2015-10-01 01:21:11 +0300
commit5c0e869357454c2aab3d02d002ffc1f0a0ab2782 (patch)
treede3bf0f70d24fc33d791f776513593da5217ea08 /arch/arm/mach-pxa/balloon3.c
parentbaafd373e9287f20ca0c9a6bb38eb6785a146ac2 (diff)
parented14ee0eea8b6808025356cecc87a8007885263f (diff)
downloadlinux-5c0e869357454c2aab3d02d002ffc1f0a0ab2782.tar.xz
Merge tag 'asoc-fix-v4.3-rc2' into asoc-pxa
ASoC: Fixes for v4.3 A disappointingly large set of fixes, though none of them very big and very widely spread over many different drivers. Nothing especially stands out, it's mostly all device specific and relatively minor.
Diffstat (limited to 'arch/arm/mach-pxa/balloon3.c')
-rw-r--r--arch/arm/mach-pxa/balloon3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index 70366b35d299..a3ebb517cca1 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -496,7 +496,7 @@ static struct irq_chip balloon3_irq_chip = {
.irq_unmask = balloon3_unmask_irq,
};
-static void balloon3_irq_handler(unsigned int __irq, struct irq_desc *desc)
+static void balloon3_irq_handler(struct irq_desc *desc)
{
unsigned long pending = __raw_readl(BALLOON3_INT_CONTROL_REG) &
balloon3_irq_enabled;