diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-11 19:00:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-11 19:00:15 -0700 |
| commit | b5121290cad7c9e1a786952da4f6d9bfbfb87597 (patch) | |
| tree | a6e2c24f8bdb86e98cb4e962183d38a304436004 /drivers/mfd/asic3.c | |
| parent | 409ab140e2ec662e473d4968e12b7ac97f5a5f4e (diff) | |
| parent | c62dd365e248222903e6e3e3a8f5d8587e7e3345 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Fix for the TWL4030 PM sleep/wakeup sequence
mfd: Fix asic3 build error
mfd: Fixed gpio polarity of omap-usb gpio USB-phy reset
Diffstat (limited to 'drivers/mfd/asic3.c')
| -rw-r--r-- | drivers/mfd/asic3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index d4a851c6b5b..0b4d5b23bec 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c @@ -144,7 +144,7 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc) int iter, i; unsigned long flags; - data->chip->irq_ack(irq_data); + data->chip->irq_ack(data); for (iter = 0 ; iter < MAX_ASIC_ISR_LOOPS; iter++) { u32 status; |