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)

2 files changed, 32 insertions, 32 deletions

diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 2774df8021dc..b666443b5cbb 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -156,21 +156,21 @@ static void __init ap_map_io(void)
 
 #define INTEGRATOR_SC_VALID_INT 0x003fffff
 
-static void sc_mask_irq(unsigned int irq)
+static void sc_mask_irq(struct irq_data *d)
 {
-        writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_CLEAR);
+        writel(1 << d->irq, VA_IC_BASE + IRQ_ENABLE_CLEAR);
 }
 
-static void sc_unmask_irq(unsigned int irq)
+static void sc_unmask_irq(struct irq_data *d)
 {
-        writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_SET);
+        writel(1 << d->irq, VA_IC_BASE + IRQ_ENABLE_SET);
 }
 
 static struct irq_chip sc_chip = {
-        .name   = "SC",
-        .ack    = sc_mask_irq,
-        .mask   = sc_mask_irq,
-        .unmask = sc_unmask_irq,
+        .name           = "SC",
+        .irq_ack        = sc_mask_irq,
+        .irq_mask       = sc_mask_irq,
+        .irq_unmask     = sc_unmask_irq,
 };
 
 static void __init ap_init_irq(void)
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 85e48a5f77b9..e9327da1382e 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -146,61 +146,61 @@ static void __init intcp_map_io(void)
 #define sic_writel      __raw_writel
 #define sic_readl       __raw_readl
 
-static void cic_mask_irq(unsigned int irq)
+static void cic_mask_irq(struct irq_data *d)
 {
-        irq -= IRQ_CIC_START;
+        unsigned int irq = d->irq - IRQ_CIC_START;
         cic_writel(1 << irq, INTCP_VA_CIC_BASE + IRQ_ENABLE_CLEAR);
 }
 
-static void cic_unmask_irq(unsigned int irq)
+static void cic_unmask_irq(struct irq_data *d)
 {
-        irq -= IRQ_CIC_START;
+        unsigned int irq = d->irq - IRQ_CIC_START;
         cic_writel(1 << irq, INTCP_VA_CIC_BASE + IRQ_ENABLE_SET);
 }
 
 static struct irq_chip cic_chip = {
-        .name   = "CIC",
-        .ack    = cic_mask_irq,
-        .mask   = cic_mask_irq,
-        .unmask = cic_unmask_irq,
+        .name           = "CIC",
+        .irq_ack        = cic_mask_irq,
+        .irq_mask       = cic_mask_irq,
+        .irq_unmask     = cic_unmask_irq,
 };
 
-static void pic_mask_irq(unsigned int irq)
+static void pic_mask_irq(struct irq_data *d)
 {
-        irq -= IRQ_PIC_START;
+        unsigned int irq = d->irq - IRQ_PIC_START;
         pic_writel(1 << irq, INTCP_VA_PIC_BASE + IRQ_ENABLE_CLEAR);
 }
 
-static void pic_unmask_irq(unsigned int irq)
+static void pic_unmask_irq(struct irq_data *d)
 {
-        irq -= IRQ_PIC_START;
+        unsigned int irq = d->irq - IRQ_PIC_START;
         pic_writel(1 << irq, INTCP_VA_PIC_BASE + IRQ_ENABLE_SET);
 }
 
 static struct irq_chip pic_chip = {
-        .name   = "PIC",
-        .ack    = pic_mask_irq,
-        .mask   = pic_mask_irq,
-        .unmask = pic_unmask_irq,
+        .name           = "PIC",
+        .irq_ack        = pic_mask_irq,
+        .irq_mask       = pic_mask_irq,
+        .irq_unmask     = pic_unmask_irq,
 };
 
-static void sic_mask_irq(unsigned int irq)
+static void sic_mask_irq(struct irq_data *d)
 {
-        irq -= IRQ_SIC_START;
+        unsigned int irq = d->irq - IRQ_SIC_START;
         sic_writel(1 << irq, INTCP_VA_SIC_BASE + IRQ_ENABLE_CLEAR);
 }
 
-static void sic_unmask_irq(unsigned int irq)
+static void sic_unmask_irq(struct irq_data *d)
 {
-        irq -= IRQ_SIC_START;
+        unsigned int irq = d->irq - IRQ_SIC_START;
         sic_writel(1 << irq, INTCP_VA_SIC_BASE + IRQ_ENABLE_SET);
 }
 
 static struct irq_chip sic_chip = {
-        .name   = "SIC",
-        .ack    = sic_mask_irq,
-        .mask   = sic_mask_irq,
-        .unmask = sic_unmask_irq,
+        .name           = "SIC",
+        .irq_ack        = sic_mask_irq,
+        .irq_mask       = sic_mask_irq,
+        .irq_unmask     = sic_unmask_irq,
 };
 
 static void