diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /include/asm-arm/arch-ns9xxx/hardware.h | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-arm/arch-ns9xxx/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-ns9xxx/hardware.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-arm/arch-ns9xxx/hardware.h b/include/asm-arm/arch-ns9xxx/hardware.h index 6819da7c48d4..25600554c4fe 100644 --- a/include/asm-arm/arch-ns9xxx/hardware.h +++ b/include/asm-arm/arch-ns9xxx/hardware.h | |||
| @@ -51,8 +51,9 @@ | |||
| 51 | ~(__REGVAL(reg ## _ ## field, value)))) \ | 51 | ~(__REGVAL(reg ## _ ## field, value)))) \ |
| 52 | | (__REGVAL(reg ## _ ## field, value)))) | 52 | | (__REGVAL(reg ## _ ## field, value)))) |
| 53 | 53 | ||
| 54 | # define REGGET(reg, field) \ | 54 | # define REGGET(var, reg, field) \ |
| 55 | ((reg & (reg ## _ ## field)) / (field & (-field))) | 55 | ((var & (reg ## _ ## field)) / \ |
| 56 | ((reg ## _ ## field) & (-(reg ## _ ## field)))) | ||
| 56 | 57 | ||
| 57 | #else | 58 | #else |
| 58 | 59 | ||