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, 28 insertions, 28 deletions

diff --git a/arch/arm/mach-tcc8k/irq.c b/arch/arm/mach-tcc8k/irq.c
index 34575c4963f0..aa9231f4fc6e 100644
--- a/arch/arm/mach-tcc8k/irq.c
+++ b/arch/arm/mach-tcc8k/irq.c
@@ -18,65 +18,65 @@
 #include "common.h"
 
 /* Disable IRQ */
-static void tcc8000_mask_ack_irq0(unsigned int irq)
+static void tcc8000_mask_ack_irq0(struct irq_data *d)
 {
-        PIC0_IEN &= ~(1 << irq);
-        PIC0_CREQ |=  (1 << irq);
+        PIC0_IEN &= ~(1 << d->irq);
+        PIC0_CREQ |=  (1 << d->irq);
 }
 
-static void tcc8000_mask_ack_irq1(unsigned int irq)
+static void tcc8000_mask_ack_irq1(struct irq_data *d)
 {
-        PIC1_IEN &= ~(1 << (irq - 32));
-        PIC1_CREQ |= (1 << (irq - 32));
+        PIC1_IEN &= ~(1 << (d->irq - 32));
+        PIC1_CREQ |= (1 << (d->irq - 32));
 }
 
-static void tcc8000_mask_irq0(unsigned int irq)
+static void tcc8000_mask_irq0(struct irq_data *d)
 {
-        PIC0_IEN &= ~(1 << irq);
+        PIC0_IEN &= ~(1 << d->irq);
 }
 
-static void tcc8000_mask_irq1(unsigned int irq)
+static void tcc8000_mask_irq1(struct irq_data *d)
 {
-        PIC1_IEN &= ~(1 << (irq - 32));
+        PIC1_IEN &= ~(1 << (d->irq - 32));
 }
 
-static void tcc8000_ack_irq0(unsigned int irq)
+static void tcc8000_ack_irq0(struct irq_data *d)
 {
-        PIC0_CREQ |=  (1 << irq);
+        PIC0_CREQ |=  (1 << d->irq);
 }
 
-static void tcc8000_ack_irq1(unsigned int irq)
+static void tcc8000_ack_irq1(struct irq_data *d)
 {
-        PIC1_CREQ |= (1 << (irq - 32));
+        PIC1_CREQ |= (1 << (d->irq - 32));
 }
 
 /* Enable IRQ */
-static void tcc8000_unmask_irq0(unsigned int irq)
+static void tcc8000_unmask_irq0(struct irq_data *d)
 {
-        PIC0_IEN |= (1 << irq);
-        PIC0_INTOEN |= (1 << irq);
+        PIC0_IEN |= (1 << d->irq);
+        PIC0_INTOEN |= (1 << d->irq);
 }
 
-static void tcc8000_unmask_irq1(unsigned int irq)
+static void tcc8000_unmask_irq1(struct irq_data *d)
 {
-        PIC1_IEN |= (1 << (irq - 32));
-        PIC1_INTOEN |= (1 << (irq - 32));
+        PIC1_IEN |= (1 << (d->irq - 32));
+        PIC1_INTOEN |= (1 << (d->irq - 32));
 }
 
 static struct irq_chip tcc8000_irq_chip0 = {
         .name           = "tcc_irq0",
-        .mask           = tcc8000_mask_irq0,
-        .ack            = tcc8000_ack_irq0,
-        .mask_ack       = tcc8000_mask_ack_irq0,
-        .unmask         = tcc8000_unmask_irq0,
+        .irq_mask       = tcc8000_mask_irq0,
+        .irq_ack        = tcc8000_ack_irq0,
+        .irq_mask_ack   = tcc8000_mask_ack_irq0,
+        .irq_unmask     = tcc8000_unmask_irq0,
 };
 
 static struct irq_chip tcc8000_irq_chip1 = {
         .name           = "tcc_irq1",
-        .mask           = tcc8000_mask_irq1,
-        .ack            = tcc8000_ack_irq1,
-        .mask_ack       = tcc8000_mask_ack_irq1,
-        .unmask         = tcc8000_unmask_irq1,
+        .irq_mask       = tcc8000_mask_irq1,
+        .irq_ack        = tcc8000_ack_irq1,
+        .irq_mask_ack   = tcc8000_mask_ack_irq1,
+        .irq_unmask     = tcc8000_unmask_irq1,
 };
 
 void __init tcc8k_init_irq(void)