diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/elf.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/elf.h')
| -rw-r--r-- | include/linux/elf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/elf.h b/include/linux/elf.h index bad1b16ec49a..ff9fbed90123 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h | |||
| @@ -208,7 +208,7 @@ typedef struct elf32_hdr{ | |||
| 208 | } Elf32_Ehdr; | 208 | } Elf32_Ehdr; |
| 209 | 209 | ||
| 210 | typedef struct elf64_hdr { | 210 | typedef struct elf64_hdr { |
| 211 | unsigned char e_ident[16]; /* ELF "magic number" */ | 211 | unsigned char e_ident[EI_NIDENT]; /* ELF "magic number" */ |
| 212 | Elf64_Half e_type; | 212 | Elf64_Half e_type; |
| 213 | Elf64_Half e_machine; | 213 | Elf64_Half e_machine; |
| 214 | Elf64_Word e_version; | 214 | Elf64_Word e_version; |