diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-09-06 18:47:31 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-09-06 18:47:31 -0400 |
| commit | c08319a9d50b5c9cb4fdb33728bd16497cf4ddd3 (patch) | |
| tree | 5fbec9030029da1ec387c18b85f26f19ee50da44 /include/asm-mips/reg.h | |
| parent | bfa0d75a1eee59f0577e3c1697ff570b77581a35 (diff) | |
| parent | 4706df3d3c42af802597d82c8b1542c3d52eab23 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-mips/reg.h')
| -rw-r--r-- | include/asm-mips/reg.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-mips/reg.h b/include/asm-mips/reg.h index 7b33bbca9585..6173004cc88e 100644 --- a/include/asm-mips/reg.h +++ b/include/asm-mips/reg.h | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | #include <linux/config.h> | 15 | #include <linux/config.h> |
| 16 | 16 | ||
| 17 | #if defined(CONFIG_MIPS32) || defined(WANT_COMPAT_REG_H) | 17 | #if defined(CONFIG_32BIT) || defined(WANT_COMPAT_REG_H) |
| 18 | 18 | ||
| 19 | #define EF_R0 6 | 19 | #define EF_R0 6 |
| 20 | #define EF_R1 7 | 20 | #define EF_R1 7 |
| @@ -70,7 +70,7 @@ | |||
| 70 | 70 | ||
| 71 | #endif | 71 | #endif |
| 72 | 72 | ||
| 73 | #if CONFIG_MIPS64 | 73 | #ifdef CONFIG_64BIT |
| 74 | 74 | ||
| 75 | #define EF_R0 0 | 75 | #define EF_R0 0 |
| 76 | #define EF_R1 1 | 76 | #define EF_R1 1 |
| @@ -124,6 +124,6 @@ | |||
| 124 | 124 | ||
| 125 | #define EF_SIZE 304 /* size in bytes */ | 125 | #define EF_SIZE 304 /* size in bytes */ |
| 126 | 126 | ||
| 127 | #endif /* CONFIG_MIPS64 */ | 127 | #endif /* CONFIG_64BIT */ |
| 128 | 128 | ||
| 129 | #endif /* __ASM_MIPS_REG_H */ | 129 | #endif /* __ASM_MIPS_REG_H */ |