diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 15:38:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 15:38:48 +0200 |
| commit | bda307ed7bdc160fcf1475a49f6c2e796fcb1294 (patch) | |
| tree | aa24926a83001373cb4ac2d8be9fd1b6994e7c60 /include/asm-h8300/elf.h | |
| parent | 0791e13fbb1ea4e1808d055922c3f116b924bdc9 (diff) | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'include/asm-h8300/elf.h')
| -rw-r--r-- | include/asm-h8300/elf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-h8300/elf.h b/include/asm-h8300/elf.h index 26bfc7e641d..a8b57d1f412 100644 --- a/include/asm-h8300/elf.h +++ b/include/asm-h8300/elf.h @@ -26,10 +26,10 @@ typedef unsigned long elf_fpregset_t; #define ELF_DATA ELFDATA2MSB #define ELF_ARCH EM_H8_300 #if defined(__H8300H__) -#define ELF_FLAGS 0x810000 +#define ELF_CORE_EFLAGS 0x810000 #endif #if defined(__H8300S__) -#define ELF_FLAGS 0x820000 +#define ELF_CORE_EFLAGS 0x820000 #endif #define ELF_PLAT_INIT(_r) _r->er1 = 0 |