diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-05-04 17:27:05 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-05-04 17:29:05 +0200 |
| commit | 5306293c9cd2caf41849cc909281bda628bb989e (patch) | |
| tree | 3be4e8231e2772c8a43ddbef5c6a72c20b3054bb /arch/arm/mach-pxa/cm-x2xx-pci.c | |
| parent | nfsd4: use local variable in nfs4svc_encode_compoundres (diff) | |
| parent | Linux 2.6.34-rc6 (diff) | |
| download | linux-5306293c9cd2caf41849cc909281bda628bb989e.tar.xz linux-5306293c9cd2caf41849cc909281bda628bb989e.zip | |
Merge commit 'v2.6.34-rc6'
Conflicts:
fs/nfsd/nfs4callback.c
Diffstat (limited to 'arch/arm/mach-pxa/cm-x2xx-pci.c')
| -rw-r--r-- | arch/arm/mach-pxa/cm-x2xx-pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/cm-x2xx-pci.c b/arch/arm/mach-pxa/cm-x2xx-pci.c index 7873fa3d8fa4..161fc2d61207 100644 --- 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(int node, unsigned long *zone_size, static void cmx2xx_it8152_irq_demux(unsigned int irq, struct irq_desc *desc) { /* clear our parent irq */ - GEDR(cmx2xx_it8152_irq_gpio) = GPIO_bit(cmx2xx_it8152_irq_gpio); + desc->chip->ack(irq); it8152_irq_demux(irq, desc); } |