Merge branch 'master' into devel

[net-next-2.6.git] / arch / arm / include / asm / elf.h

diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
index def8eac6e89d42dbb55078e463d1dc8c07a6bf07..d7da19bcf9287f325816dbda4d80083dbf0a7374 100644 (file)
--- 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
 
 /*