Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b137769 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4edf5886 6fcb8a3a

drivers/mfd/jz4740-adc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);