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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
cm-x2xx-pci.c
diff --git
a/arch/arm/mach-pxa/cm-x2xx-pci.c
b/arch/arm/mach-pxa/cm-x2xx-pci.c
index
0f31305
..
a2380cd
100644
(file)
--- a/
arch/arm/mach-pxa/cm-x2xx-pci.c
+++ b/
arch/arm/mach-pxa/cm-x2xx-pci.c
@@
-59,7
+59,7
@@
void __init cmx2xx_pci_adjust_zones(unsigned long *zone_size,
static void cmx2xx_it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
{
/* clear our parent irq */
- desc->
chip->ack(irq
);
+ desc->
irq_data.chip->irq_ack(&desc->irq_data
);
it8152_irq_demux(irq, desc);
}