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:
  [ARM] pxa: corgi backlight driver should not select ssp drivers
  [ARM] 5321/1: Kirkwood: fix typo in Makefile
  [ARM] 5320/1: fix assembly constraints in implementation of do_div()
  [ARM] 5318/1: Swap the PRRR and NMRR values in proc-v7.S
  [ARM] 5316/1: AT91: oops (regression) fix on gpio irq
  [ARM] msm: vreg interface to msm7k pmic
  [ARM] msm: dma: various basic dma improvements and bugfixes
  [ARM] msm: clock: provide clk_*() api support for
  [ARM] msm: clean up iomap and devices
  [ARM] msm: add proc_comm support, necessary for clock and power control
  [ARM] msm: rename ARCH_MSM7X00A to ARCH_MSM
  [ARM] pxa/spitz: fix unbalance parenthesis in header file spitz.h
  [ARM] pxa: update {corgi,spitz}_defconfig to favor SPI-based drivers
  [ARM] pxa: fix the corgi_ssp.c dependency issue in {corgi,spitz}_defconfig
  Revert "[ARM] pxa/corgi: remove now unused corgi_ssp.c and corgi_lcd.c"

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/arm/mach-msm/irq.c b/arch/arm/mach-msm/irq.c
index 04b8d182ff8a..69ca0dd79bdf 100644
--- a/arch/arm/mach-msm/irq.c
+++ b/arch/arm/mach-msm/irq.c
@@ -66,20 +66,20 @@
 
 static void msm_irq_ack(unsigned int irq)
 {
-        unsigned reg = VIC_INT_CLEAR0 + ((irq & 32) ? 4 : 0);
+        void __iomem *reg = VIC_INT_CLEAR0 + ((irq & 32) ? 4 : 0);
         irq = 1 << (irq & 31);
         writel(irq, reg);
 }
 
 static void msm_irq_mask(unsigned int irq)
 {
-        unsigned reg = VIC_INT_ENCLEAR0 + ((irq & 32) ? 4 : 0);
+        void __iomem *reg = VIC_INT_ENCLEAR0 + ((irq & 32) ? 4 : 0);
         writel(1 << (irq & 31), reg);
 }
 
 static void msm_irq_unmask(unsigned int irq)
 {
-        unsigned reg = VIC_INT_ENSET0 + ((irq & 32) ? 4 : 0);
+        void __iomem *reg = VIC_INT_ENSET0 + ((irq & 32) ? 4 : 0);
         writel(1 << (irq & 31), reg);
 }
 
@@ -90,8 +90,8 @@ static int msm_irq_set_wake(unsigned int irq, unsigned int on)
 
 static int msm_irq_set_type(unsigned int irq, unsigned int flow_type)
 {
-        unsigned treg = VIC_INT_TYPE0 + ((irq & 32) ? 4 : 0);
-        unsigned preg = VIC_INT_POLARITY0 + ((irq & 32) ? 4 : 0);
+        void __iomem *treg = VIC_INT_TYPE0 + ((irq & 32) ? 4 : 0);
+        void __iomem *preg = VIC_INT_POLARITY0 + ((irq & 32) ? 4 : 0);
         int b = 1 << (irq & 31);
 
         if (flow_type & (IRQF_TRIGGER_FALLING | IRQF_TRIGGER_LOW))