diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-14 15:48:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-14 15:48:06 -0800 |
| commit | c7868048a7314bb4a2973097d605f00acd3b70bd (patch) | |
| tree | af27746d5b75c22e9cbc4d7145562e2accc650c0 /include | |
| parent | 9d149c27eb1581edd239c0db96a407a4fc5e9f18 (diff) | |
| parent | c2e2611425a956d25d2948c5d95d3848c4db1257 (diff) | |
| download | lwn-c7868048a7314bb4a2973097d605f00acd3b70bd.tar.gz lwn-c7868048a7314bb4a2973097d605f00acd3b70bd.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/elf.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/elf.h b/include/asm-arm/elf.h index 7da97a937548..2d44b42d1847 100644 --- a/include/asm-arm/elf.h +++ b/include/asm-arm/elf.h @@ -22,6 +22,8 @@ typedef unsigned long elf_freg_t[3]; #define R_ARM_NONE 0 #define R_ARM_PC24 1 #define R_ARM_ABS32 2 +#define R_ARM_CALL 28 +#define R_ARM_JUMP24 29 #define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t)) typedef elf_greg_t elf_gregset_t[ELF_NGREG]; |