diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 17:00:06 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 17:00:06 +0100 |
| commit | 61420e147a706ee7c7a902008045547fb2a2a330 (patch) | |
| tree | c5739fe1feac05cac49c96107138520c65f8f657 /include/asm-arm | |
| parent | [libata sata_promise] irq_pio: fix merge bug (diff) | |
| parent | Merge branch 'master' (diff) | |
| download | linux-61420e147a706ee7c7a902008045547fb2a2a330.tar.xz linux-61420e147a706ee7c7a902008045547fb2a2a330.zip | |
Merge branch 'upstream'
Diffstat (limited to 'include/asm-arm')
| -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]; |