diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-08 17:21:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-08 17:21:52 +0100 |
| commit | 86cb2ec7b22a0a89b8660110dc03321fadbef45f (patch) | |
| tree | c4162b0ab7c4e3602e2b7a6a6fd47c55c3315fea /drivers/mfd/asic3.c | |
| parent | 7f0030b211579939461468f25b80c73e293c46e0 (diff) | |
| parent | a5abba989deceb731047425812d268daf7536575 (diff) | |
Merge commit 'v2.6.38-rc8' into perf/core
Merge reason: Merge latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/mfd/asic3.c')
| -rw-r--r-- | drivers/mfd/asic3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index 6a1f9404261..c45e6305b26 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c @@ -143,9 +143,9 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc) unsigned long flags; struct asic3 *asic; - desc->chip->ack(irq); + desc->irq_data.chip->irq_ack(&desc->irq_data); - asic = desc->handler_data; + asic = get_irq_data(irq); for (iter = 0 ; iter < MAX_ASIC_ISR_LOOPS; iter++) { u32 status; |