ns9xxx: fix assembler version of __REG2 to be consistent with the C version

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-ns9xxx / hardware.h

diff --git a/include/asm-arm/arch-ns9xxx/hardware.h b/include/asm-arm/arch-ns9xxx/hardware.h
index 0b7b34603f1c9f9f97eea93ccd3fa409ff968fff..0dca11ce21fcfdeac2636b5c46424a13c37905c5 100644 (file)
--- a/include/asm-arm/arch-ns9xxx/hardware.h
+++ b/include/asm-arm/arch-ns9xxx/hardware.h
@@ -66,13 +66,13 @@
         __REGGET(var, reg ## _ ## field) / __REGSHIFT(reg ## _ ## field)
 
 #  define REGGETIM_IDX(var, reg, field, idx)                           \
-        __REGGET(var, reg ## _ ## field((idx))) /                      \
+        __REGGET(var, reg ## _ ## field((idx))) /                      \
         __REGSHIFT(reg ## _ ## field((idx)))
 
 #else
 
 #  define __REG(x)     io_p2v(x)
-#  define __REG2(x, y) io_p2v((x) + (y))
+#  define __REG2(x, y) io_p2v((x) + 4 * (y))
 
 #endif