diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-02 19:23:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-02 19:23:44 -0700 |
| commit | 9b13776977d45505469edc6decc93e9e3799afe2 (patch) | |
| tree | e66402e229b7cecd5841f021e825eb487d8beec6 /drivers | |
| parent | 4edf5886bba1a3fba3b780c7263f64c23536a4a5 (diff) | |
| parent | 6fcb8a3a3a542ca078dc739fe0ea97191bc59e74 (diff) | |
Merge branch 'for-linus' of git://git.infradead.org/users/sameo/mfd-2.6
* 'for-linus' of git://git.infradead.org/users/sameo/mfd-2.6:
mfd: Fix generic irq chip ack function name for jz4740-adc
Diffstat (limited to 'drivers')
| -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); |