KVM: MMU: mmu_convert_notrap helper

[linux-2.6-omap-h63xx.git] / arch / arm / mach-mx3 / iomux.c

diff --git a/arch/arm/mach-mx3/iomux.c b/arch/arm/mach-mx3/iomux.c
index 3dda1fe23cbf13ee2346523b9f54f439498aa534..6e664be8cc13ed187ba28159cec8283ccd1e3c1a 100644 (file)
--- a/arch/arm/mach-mx3/iomux.c
+++ b/arch/arm/mach-mx3/iomux.c
@@ -43,7 +43,8 @@ static DEFINE_SPINLOCK(gpio_mux_lock);
  */
 int mxc_iomux_mode(unsigned int pin_mode)
 {
-       u32 reg, field, l, mode, ret = 0;
+       u32 field, l, mode, ret = 0;
+       void __iomem *reg;
 
        reg = IOMUXSW_MUX_CTL + (pin_mode & IOMUX_REG_MASK);
        field = pin_mode & 0x3;
@@ -70,7 +71,8 @@ EXPORT_SYMBOL(mxc_iomux_mode);
  */
 void mxc_iomux_set_pad(enum iomux_pins pin, u32 config)
 {
-       u32 reg, field, l;
+       u32 field, l;
+       void __iomem *reg;
 
        reg = IOMUXSW_PAD_CTL + (pin + 2) / 3;
        field = (pin + 2) % 3;