diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:30:18 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:30:18 -0400 |
| commit | 9759d22c8348343b0da4e25d6150c41712686c14 (patch) | |
| tree | 338b185f11d705258888a8f2318a3a3b7ea0968d /arch/arm/include | |
| parent | ed40d0c472b136682b2fcba05f89762859c7374f (diff) | |
| parent | f0bba9f934517533acbda7329be93f55d5a01c03 (diff) | |
Merge branch 'master' into devel
Conflicts:
arch/arm/include/asm/elf.h
arch/arm/kernel/module.c
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/elf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h index def8eac6e89d..d7da19bcf928 100644 --- a/arch/arm/include/asm/elf.h +++ b/arch/arm/include/asm/elf.h | |||
| @@ -50,6 +50,7 @@ typedef struct user_fp elf_fpregset_t; | |||
| 50 | #define R_ARM_ABS32 2 | 50 | #define R_ARM_ABS32 2 |
| 51 | #define R_ARM_CALL 28 | 51 | #define R_ARM_CALL 28 |
| 52 | #define R_ARM_JUMP24 29 | 52 | #define R_ARM_JUMP24 29 |
| 53 | #define R_ARM_V4BX 40 | ||
| 53 | #define R_ARM_PREL31 42 | 54 | #define R_ARM_PREL31 42 |
| 54 | 55 | ||
| 55 | /* | 56 | /* |