diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-10-24 13:42:08 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-10-24 13:42:08 +0200 |
| commit | a853ba8d6d5d76bcbc5bf35b945b5727b5e5a36d (patch) | |
| tree | 8faa7c17a8babd6b6fd63e13b85799a881e31956 /drivers/mfd/jz4740-adc.c | |
| parent | 5bdb7613414a9884166b2f5f20ad0353c1c6b6f3 (diff) | |
| parent | c3b92c8787367a8bb53d57d9789b558f1295cc96 (diff) | |
Merge commit 'v3.1' into spi/next
Diffstat (limited to 'drivers/mfd/jz4740-adc.c')
| -rw-r--r-- | drivers/mfd/jz4740-adc.c | 2 |
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); |