Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel

1 files changed, 9 insertions, 7 deletions

diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
index d7da19bcf92..c207504de84 100644
--- a/arch/arm/include/asm/elf.h
+++ b/arch/arm/include/asm/elf.h
@@ -45,13 +45,15 @@ typedef struct user_fp elf_fpregset_t;
 #define EF_ARM_HASENTRY         0x00000002      /* All */
 #define EF_ARM_RELEXEC          0x00000001      /* All */
 
-#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 R_ARM_V4BX      40
-#define R_ARM_PREL31    42
+#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 R_ARM_V4BX              40
+#define R_ARM_PREL31            42
+#define R_ARM_MOVW_ABS_NC       43
+#define R_ARM_MOVT_ABS          44
 
 /*
  * These are used to set parameters in the core dumps.