git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
drivers
/
mfd
/
asic3.c
diff --git
a/drivers/mfd/asic3.c
b/drivers/mfd/asic3.c
index
6a1f940
..
c45e630
100644
(file)
--- 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;