Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[mirror_ubuntu-artful-kernel.git] / include / linux / elf.h

diff --git a/include/linux/elf.h b/include/linux/elf.h
index 20fa8d8ae31335744c4566eb8b6305997b44db8b..ba069e8f4f7873b002da2d632d81520eb2a662fd 100644 (file)
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -29,6 +29,7 @@ extern Elf32_Dyn _DYNAMIC [];
 #define elf_note       elf32_note
 #define elf_addr_t     Elf32_Off
 #define Elf_Half       Elf32_Half
+#define Elf_Word       Elf32_Word
 
 #else
 
@@ -39,6 +40,7 @@ extern Elf64_Dyn _DYNAMIC [];
 #define elf_note       elf64_note
 #define elf_addr_t     Elf64_Off
 #define Elf_Half       Elf64_Half
+#define Elf_Word       Elf64_Word
 
 #endif