aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/elf.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-03-28 20:30:18 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-28 20:30:18 +0000
commit9759d22c8348343b0da4e25d6150c41712686c14 (patch)
tree338b185f11d705258888a8f2318a3a3b7ea0968d /arch/arm/include/asm/elf.h
parented40d0c472b136682b2fcba05f89762859c7374f (diff)
parentf0bba9f934517533acbda7329be93f55d5a01c03 (diff)
Merge branch 'master' into devel
Conflicts: arch/arm/include/asm/elf.h arch/arm/kernel/module.c
Diffstat (limited to 'arch/arm/include/asm/elf.h')
-rw-r--r--arch/arm/include/asm/elf.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
index def8eac6e89..d7da19bcf92 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;
#define R_ARM_ABS32 2
#define R_ARM_CALL 28
#define R_ARM_JUMP24 29
+#define R_ARM_V4BX 40
#define R_ARM_PREL31 42
/*