Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
  [ARM] 5300/1: fixup spitz reset during boot
  [ARM] 5295/1: make ZONE_DMA optional
  [ARM] 5239/1: Palm Zire 72 power management support
  [ARM] 5298/1: Drop desc_handle_irq()
  [ARM] 5297/1: [KS8695] Fix two compile-time warnings
  [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
  [ARM] pxa: allow multi-machine PCMCIA builds
  [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
  [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
  [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
  [ARM] pxa/zylonite: add support for USB OHCI
  [ARM] ohci-pxa27x: use ioremap() and offset for register access
  [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
  [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
  [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
  [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
  [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
  [ARM] pxa: simplify DMA register definitions
  [ARM] pxa: make additional DCSR bits valid for PXA3xx
  [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
  ...

Fixed up conflicts in
	arch/arm/mach-versatile/core.c
	sound/soc/pxa/pxa2xx-ac97.c
	sound/soc/pxa/pxa2xx-i2s.c
manually.

1 files changed, 3 insertions, 8 deletions

diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c
index 4856a6bd2482..6ccd175bc4cf 100644
--- a/arch/arm/mach-sa1100/neponset.c
+++ b/arch/arm/mach-sa1100/neponset.c
@@ -33,8 +33,6 @@ neponset_irq_handler(unsigned int irq, struct irq_desc *desc)
         unsigned int irr;
 
         while (1) {
-                struct irq_desc *d;
-
                 /*
                  * Acknowledge the parent IRQ.
                  */
@@ -67,21 +65,18 @@ neponset_irq_handler(unsigned int irq, struct irq_desc *desc)
                         desc->chip->ack(irq);
 
                         if (irr & IRR_ETHERNET) {
-                                d = irq_desc + IRQ_NEPONSET_SMC9196;
-                                desc_handle_irq(IRQ_NEPONSET_SMC9196, d);
+                                generic_handle_irq(IRQ_NEPONSET_SMC9196);
                         }
 
                         if (irr & IRR_USAR) {
-                                d = irq_desc + IRQ_NEPONSET_USAR;
-                                desc_handle_irq(IRQ_NEPONSET_USAR, d);
+                                generic_handle_irq(IRQ_NEPONSET_USAR);
                         }
 
                         desc->chip->unmask(irq);
                 }
 
                 if (irr & IRR_SA1111) {
-                        d = irq_desc + IRQ_NEPONSET_SA1111;
-                        desc_handle_irq(IRQ_NEPONSET_SA1111, d);
+                        generic_handle_irq(IRQ_NEPONSET_SA1111);
                 }
         }
 }