diff options
| author | Andi Kleen <andi@basil.nowhere.org> | 2006-11-21 04:22:09 -0500 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-11-21 04:22:09 -0500 |
| commit | 1b7f6a626f0ff511c3840678466cbfe1d62c0b29 (patch) | |
| tree | 415e8c838c0067bff384afb8a2c91e5f7c6d11d3 /include/asm-mips/asm.h | |
| parent | b3edc9cec07ade41aaf1804f7c9e876afa90c862 (diff) | |
| parent | 3f5a6ca31c334011fd929501a078424c0d3f71be (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-mips/asm.h')
| -rw-r--r-- | include/asm-mips/asm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-mips/asm.h b/include/asm-mips/asm.h index e3038a4599ee..838eb3144d81 100644 --- a/include/asm-mips/asm.h +++ b/include/asm-mips/asm.h | |||
| @@ -344,6 +344,7 @@ symbol = value | |||
| 344 | #define PTR_L lw | 344 | #define PTR_L lw |
| 345 | #define PTR_S sw | 345 | #define PTR_S sw |
| 346 | #define PTR_LA la | 346 | #define PTR_LA la |
| 347 | #define PTR_LI li | ||
| 347 | #define PTR_SLL sll | 348 | #define PTR_SLL sll |
| 348 | #define PTR_SLLV sllv | 349 | #define PTR_SLLV sllv |
| 349 | #define PTR_SRL srl | 350 | #define PTR_SRL srl |
| @@ -368,6 +369,7 @@ symbol = value | |||
| 368 | #define PTR_L ld | 369 | #define PTR_L ld |
| 369 | #define PTR_S sd | 370 | #define PTR_S sd |
| 370 | #define PTR_LA dla | 371 | #define PTR_LA dla |
| 372 | #define PTR_LI dli | ||
| 371 | #define PTR_SLL dsll | 373 | #define PTR_SLL dsll |
| 372 | #define PTR_SLLV dsllv | 374 | #define PTR_SLLV dsllv |
| 373 | #define PTR_SRL dsrl | 375 | #define PTR_SRL dsrl |