Merge branch 'master' into devel

[linux-2.6-omap-h63xx.git] / arch / arm / include / asm / elf.h

diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
index ce3b36e9df81afffb6be14412d59dcbfd49abc7d..d7da19bcf9287f325816dbda4d80083dbf0a7374 100644 (file)
--- a/arch/arm/include/asm/elf.h
+++ b/arch/arm/include/asm/elf.h
@@ -51,6 +51,7 @@ typedef struct user_fp elf_fpregset_t;
 #define R_ARM_CALL     28
 #define R_ARM_JUMP24   29
 #define R_ARM_V4BX     40
+#define R_ARM_PREL31   42
 
 /*
  * These are used to set parameters in the core dumps.