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

diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index cb660bc54d7a..ae5fe7292e0d 100644
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
@@ -204,26 +204,26 @@ static void __init vic_pm_register(void __iomem *base, unsigned int irq, u32 res
 static inline void vic_pm_register(void __iomem *base, unsigned int irq, u32 arg1) { }
 #endif /* CONFIG_PM */
 
-static void vic_ack_irq(unsigned int irq)
+static void vic_ack_irq(struct irq_data *d)
 {
-        void __iomem *base = get_irq_chip_data(irq);
-        irq &= 31;
+        void __iomem *base = irq_data_get_irq_chip_data(d);
+        unsigned int irq = d->irq & 31;
         writel(1 << irq, base + VIC_INT_ENABLE_CLEAR);
         /* moreover, clear the soft-triggered, in case it was the reason */
         writel(1 << irq, base + VIC_INT_SOFT_CLEAR);
 }
 
-static void vic_mask_irq(unsigned int irq)
+static void vic_mask_irq(struct irq_data *d)
 {
-        void __iomem *base = get_irq_chip_data(irq);
-        irq &= 31;
+        void __iomem *base = irq_data_get_irq_chip_data(d);
+        unsigned int irq = d->irq & 31;
         writel(1 << irq, base + VIC_INT_ENABLE_CLEAR);
 }
 
-static void vic_unmask_irq(unsigned int irq)
+static void vic_unmask_irq(struct irq_data *d)
 {
-        void __iomem *base = get_irq_chip_data(irq);
-        irq &= 31;
+        void __iomem *base = irq_data_get_irq_chip_data(d);
+        unsigned int irq = d->irq & 31;
         writel(1 << irq, base + VIC_INT_ENABLE);
 }
 
@@ -242,10 +242,10 @@ static struct vic_device *vic_from_irq(unsigned int irq)
         return NULL;
 }
 
-static int vic_set_wake(unsigned int irq, unsigned int on)
+static int vic_set_wake(struct irq_data *d, unsigned int on)
 {
-        struct vic_device *v = vic_from_irq(irq);
-        unsigned int off = irq & 31;
+        struct vic_device *v = vic_from_irq(d->irq);
+        unsigned int off = d->irq & 31;
         u32 bit = 1 << off;
 
         if (!v)
@@ -267,10 +267,10 @@ static int vic_set_wake(unsigned int irq, unsigned int on)
 
 static struct irq_chip vic_chip = {
         .name           = "VIC",
-        .ack            = vic_ack_irq,
-        .mask           = vic_mask_irq,
-        .unmask         = vic_unmask_irq,
-        .set_wake       = vic_set_wake,
+        .irq_ack        = vic_ack_irq,
+        .irq_mask       = vic_mask_irq,
+        .irq_unmask     = vic_unmask_irq,
+        .irq_set_wake   = vic_set_wake,
 };
 
 static void __init vic_disable(void __iomem *base)