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

* 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (161 commits)
  ARM: pxa: fix building issue of missing physmap.h
  ARM: mmp: PXA910 drive strength FAST using wrong value
  ARM: mmp: MMP2 drive strength FAST using wrong value
  ARM: pxa: fix recursive calls in pxa_low_gpio_chip
  AT91: Support for gsia18s board
  AT91: Acme Systems FOX Board G20 board files
  AT91: board-sam9m10g45ek.c: Remove duplicate inclusion of mach/hardware.h
  ARM: pxa: fix suspend/resume array index miscalculation
  ARM: pxa: use cpu_has_ipr() consistently in irq.c
  ARM: pxa: remove unused variable in clock-pxa3xx.c
  ARM: pxa: fix warning in zeus.c
  ARM: sa1111: fix typo in sa1111_retrigger_lowirq()
  ARM mxs: clkdev related compile fixes
  ARM i.MX mx31_3ds: Fix MC13783 regulator names
  ARM: plat-stmp3xxx: irq_data conversion.
  ARM: plat-spear: irq_data conversion.
  ARM: plat-orion: irq_data conversion.
  ARM: plat-omap: irq_data conversion.
  ARM: plat-nomadik: irq_data conversion.
  ARM: plat-mxc: irq_data conversion.
  ...

Fix up trivial conflict in arch/arm/plat-omap/gpio.c (Lennert
Buytenhek's irq_data conversion clashing with some omap irq updates)

1 files changed, 15 insertions, 15 deletions

diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c
index 43da8bb4926..29ffa750fbe 100644
--- a/arch/arm/mach-netx/generic.c
+++ b/arch/arm/mach-netx/generic.c
@@ -88,13 +88,13 @@ netx_hif_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
 }
 
 static int
-netx_hif_irq_type(unsigned int _irq, unsigned int type)
+netx_hif_irq_type(struct irq_data *d, unsigned int type)
 {
         unsigned int val, irq;
 
         val = readl(NETX_DPMAS_IF_CONF1);
 
-        irq = _irq - NETX_IRQ_HIF_CHAINED(0);
+        irq = d->irq - NETX_IRQ_HIF_CHAINED(0);
 
         if (type & IRQ_TYPE_EDGE_RISING) {
                 DEBUG_IRQ("rising edges\n");
@@ -119,49 +119,49 @@ netx_hif_irq_type(unsigned int _irq, unsigned int type)
 }
 
 static void
-netx_hif_ack_irq(unsigned int _irq)
+netx_hif_ack_irq(struct irq_data *d)
 {
         unsigned int val, irq;
 
-        irq = _irq - NETX_IRQ_HIF_CHAINED(0);
+        irq = d->irq - NETX_IRQ_HIF_CHAINED(0);
         writel((1 << 24) << irq, NETX_DPMAS_INT_STAT);
 
         val = readl(NETX_DPMAS_INT_EN);
         val &= ~((1 << 24) << irq);
         writel(val, NETX_DPMAS_INT_EN);
 
-        DEBUG_IRQ("%s: irq %d\n", __func__, _irq);
+        DEBUG_IRQ("%s: irq %d\n", __func__, d->irq);
 }
 
 static void
-netx_hif_mask_irq(unsigned int _irq)
+netx_hif_mask_irq(struct irq_data *d)
 {
         unsigned int val, irq;
 
-        irq = _irq - NETX_IRQ_HIF_CHAINED(0);
+        irq = d->irq - NETX_IRQ_HIF_CHAINED(0);
         val = readl(NETX_DPMAS_INT_EN);
         val &= ~((1 << 24) << irq);
         writel(val, NETX_DPMAS_INT_EN);
-        DEBUG_IRQ("%s: irq %d\n", __func__, _irq);
+        DEBUG_IRQ("%s: irq %d\n", __func__, d->irq);
 }
 
 static void
-netx_hif_unmask_irq(unsigned int _irq)
+netx_hif_unmask_irq(struct irq_data *d)
 {
         unsigned int val, irq;
 
-        irq = _irq - NETX_IRQ_HIF_CHAINED(0);
+        irq = d->irq - NETX_IRQ_HIF_CHAINED(0);
         val = readl(NETX_DPMAS_INT_EN);
         val |= (1 << 24) << irq;
         writel(val, NETX_DPMAS_INT_EN);
-        DEBUG_IRQ("%s: irq %d\n", __func__, _irq);
+        DEBUG_IRQ("%s: irq %d\n", __func__, d->irq);
 }
 
 static struct irq_chip netx_hif_chip = {
-        .ack = netx_hif_ack_irq,
-        .mask = netx_hif_mask_irq,
-        .unmask = netx_hif_unmask_irq,
-        .set_type = netx_hif_irq_type,
+        .irq_ack = netx_hif_ack_irq,
+        .irq_mask = netx_hif_mask_irq,
+        .irq_unmask = netx_hif_unmask_irq,
+        .irq_set_type = netx_hif_irq_type,
 };
 
 void __init netx_init_irq(void)