]> err.no Git - linux-2.6/commitdiff
ns9xxx: fix assembler version of __REG2 to be consistent with the C version
authorUwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Wed, 21 May 2008 08:17:07 +0000 (10:17 +0200)
committerUwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Fri, 30 May 2008 08:46:11 +0000 (10:46 +0200)
It's not very critical because __REG2 isn't used in assembler code
currently.

Additionally some white space noise is fixed.

Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
include/asm-arm/arch-ns9xxx/hardware.h

index 0b7b34603f1c9f9f97eea93ccd3fa409ff968fff..0dca11ce21fcfdeac2636b5c46424a13c37905c5 100644 (file)
         __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