diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-12-14 16:21:48 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-12-14 16:21:48 -0800 |
| commit | 28247644cc07b54a798d997631d01531f2d9acfd (patch) | |
| tree | a4cffdcacd92504b23045cdea60f8c4aa45dd466 /include/asm-arm/elf.h | |
| parent | 1542272a60ab9c0655a13ead8b7d7a661365f9fb (diff) | |
| parent | c7868048a7314bb4a2973097d605f00acd3b70bd (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-arm/elf.h')
| -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 7da97a93754..2d44b42d184 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]; |