aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <Uwe.Kleine-Koenig@digi.com>2008-05-21 10:17:07 +0200
committerUwe Kleine-König <Uwe.Kleine-Koenig@digi.com>2008-05-30 10:46:11 +0200
commita4831fbe096a6f4f691fd71b041ce27add54088e (patch)
tree9010989eabe5eda354448e7942eae524da880f27
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 (diff)
downloadlinux-dev-a4831fbe096a6f4f691fd71b041ce27add54088e.tar.xz
linux-dev-a4831fbe096a6f4f691fd71b041ce27add54088e.zip
ns9xxx: fix assembler version of __REG2 to be consistent with the C version
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>
-rw-r--r--include/asm-arm/arch-ns9xxx/hardware.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/arch-ns9xxx/hardware.h b/include/asm-arm/arch-ns9xxx/hardware.h
index 0b7b34603f1c..0dca11ce21fc 100644
--- 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