From e86cb01b40f0b9a75e6ccf3d4b4b8fda0fd443c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Fri, 30 May 2008 10:46:30 +0200 Subject: [PATCH] --- yaml --- r: 100694 b: refs/heads/master c: e22af66fc85a8b008237970da4d9b6910422536b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-ns9xxx/hardware.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 203b6d233b17..a6cc35418c5e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7b0b939d54b457ba172e088f477af2012aef9b3 +refs/heads/master: e22af66fc85a8b008237970da4d9b6910422536b diff --git a/trunk/include/asm-arm/arch-ns9xxx/hardware.h b/trunk/include/asm-arm/arch-ns9xxx/hardware.h index 0b7b34603f1c..0dca11ce21fc 100644 --- a/trunk/include/asm-arm/arch-ns9xxx/hardware.h +++ b/trunk/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