diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /arch/mips/include/asm/mipsregs.h | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'arch/mips/include/asm/mipsregs.h')
| -rw-r--r-- | arch/mips/include/asm/mipsregs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h index 979866000da4..9316324d070d 100644 --- a/arch/mips/include/asm/mipsregs.h +++ b/arch/mips/include/asm/mipsregs.h | |||
| @@ -192,6 +192,7 @@ | |||
| 192 | #define PM_16M 0x01ffe000 | 192 | #define PM_16M 0x01ffe000 |
| 193 | #define PM_64M 0x07ffe000 | 193 | #define PM_64M 0x07ffe000 |
| 194 | #define PM_256M 0x1fffe000 | 194 | #define PM_256M 0x1fffe000 |
| 195 | #define PM_1G 0x7fffe000 | ||
| 195 | 196 | ||
| 196 | #endif | 197 | #endif |
| 197 | 198 | ||