From a8a2c9b7fd85aa3a09cd1623ec92f9b037026837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Wed, 28 Mar 2007 17:18:30 +0100 Subject: [PATCH] --- yaml --- r: 54016 b: refs/heads/master c: fee64d1b55af57d7dba41f554769db83d7a32fde h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-netx/netx-regs.h | 4 ++-- trunk/include/asm-arm/arch-ns9xxx/hardware.h | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3bdb18889055..20615eaad3e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe7fdb80e9e576e181b189d0fae62d35cb30fe4d +refs/heads/master: fee64d1b55af57d7dba41f554769db83d7a32fde diff --git a/trunk/include/asm-arm/arch-netx/netx-regs.h b/trunk/include/asm-arm/arch-netx/netx-regs.h index fc9aa21f360c..8ab45bea83ca 100644 --- a/trunk/include/asm-arm/arch-netx/netx-regs.h +++ b/trunk/include/asm-arm/arch-netx/netx-regs.h @@ -121,8 +121,8 @@ #define NETX_SYSTEM_IOC_MR NETX_SYSTEM_REG(0x08) /* FIXME: Docs are not consistent */ -/* #define NETX_SYSTEM_RES_CR NETX_SYSTEM_REG(0x08) */ -#define NETX_SYSTEM_RES_CR NETX_SYSTEM_REG(0x0c) +#define NETX_SYSTEM_RES_CR NETX_SYSTEM_REG(0x08) +/* #define NETX_SYSTEM_RES_CR NETX_SYSTEM_REG(0x0c) */ #define NETX_SYSTEM_PHY_CONTROL NETX_SYSTEM_REG(0x10) #define NETX_SYSTEM_REV NETX_SYSTEM_REG(0x34) diff --git a/trunk/include/asm-arm/arch-ns9xxx/hardware.h b/trunk/include/asm-arm/arch-ns9xxx/hardware.h index 6819da7c48d4..25600554c4fe 100644 --- a/trunk/include/asm-arm/arch-ns9xxx/hardware.h +++ b/trunk/include/asm-arm/arch-ns9xxx/hardware.h @@ -51,8 +51,9 @@ ~(__REGVAL(reg ## _ ## field, value)))) \ | (__REGVAL(reg ## _ ## field, value)))) -# define REGGET(reg, field) \ - ((reg & (reg ## _ ## field)) / (field & (-field))) +# define REGGET(var, reg, field) \ + ((var & (reg ## _ ## field)) / \ + ((reg ## _ ## field) & (-(reg ## _ ## field)))) #else