Input: pxa27x_keypad - miscellaneous fixes

[linux-2.6] / include / linux / elf.h

diff --git a/include/linux/elf.h b/include/linux/elf.h
index 30eb6fbd5323851523a0c2d8033424b86f93eedf..ff9fbed90123faff8fb8e3a7817a831f6bc5e276 100644 (file)
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -3,7 +3,9 @@
 
 #include <linux/types.h>
 #include <linux/elf-em.h>
+#ifdef __KERNEL__
 #include <asm/elf.h>
+#endif
 
 struct file;
 
@@ -206,7 +208,7 @@ typedef struct elf32_hdr{
 } Elf32_Ehdr;
 
 typedef struct elf64_hdr {
-  unsigned char        e_ident[16];            /* ELF "magic number" */
+  unsigned char        e_ident[EI_NIDENT];     /* ELF "magic number" */
   Elf64_Half e_type;
   Elf64_Half e_machine;
   Elf64_Word e_version;