summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/jz4740-adc.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2011-09-19 16:17:55 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2011-09-21 13:06:34 +0200
commit6fcb8a3a3a542ca078dc739fe0ea97191bc59e74 (patch)
tree76cbfb4d5bd0d40a9da7fe4b33d807a8dc5bfbc1 /drivers/mfd/jz4740-adc.c
parentMerge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc (diff)
downloadlinux-6fcb8a3a3a542ca078dc739fe0ea97191bc59e74.tar.xz
linux-6fcb8a3a3a542ca078dc739fe0ea97191bc59e74.zip
mfd: Fix generic irq chip ack function name for jz4740-adc
In commit 659fb32d1b6("genirq: replace irq_gc_ack() with {set,clr}_bit variants"), irq_gc_ack was renamed to irq_gc_ack_set_bit. The jz4740-adc driver still uses the old name which results in a compile error. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/jz4740-adc.c')
-rw-r--r--drivers/mfd/jz4740-adc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index 21131c7b0f1e..563654c9b19e 100644
--- a/drivers/mfd/jz4740-adc.c
+++ b/drivers/mfd/jz4740-adc.c
@@ -273,7 +273,7 @@ static int __devinit jz4740_adc_probe(struct platform_device *pdev)
ct->regs.ack = JZ_REG_ADC_STATUS;
ct->chip.irq_mask = irq_gc_mask_set_bit;
ct->chip.irq_unmask = irq_gc_mask_clr_bit;
- ct->chip.irq_ack = irq_gc_ack;
+ ct->chip.irq_ack = irq_gc_ack_set_bit;
irq_setup_generic_chip(gc, IRQ_MSK(5), 0, 0, IRQ_NOPROBE | IRQ_LEVEL);