diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 02:55:25 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 02:55:25 -0500 |
| commit | 7755726fe90a8b253659756e6de68c1a55aa427f (patch) | |
| tree | a3523fa77e07854db3b8089e3066a55ea997060c /arch/sh/include/asm/elf.h | |
| parent | 3bf127637e22ddf95e67e10a23c339cee3d52429 (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge commit 'v2.6.33-rc5' into next
Diffstat (limited to 'arch/sh/include/asm/elf.h')
| -rw-r--r-- | arch/sh/include/asm/elf.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h index ccb1d93bb043..ac04255022b6 100644 --- a/arch/sh/include/asm/elf.h +++ b/arch/sh/include/asm/elf.h | |||
| @@ -114,7 +114,6 @@ typedef struct user_fpu_struct elf_fpregset_t; | |||
| 114 | */ | 114 | */ |
| 115 | #define CORE_DUMP_USE_REGSET | 115 | #define CORE_DUMP_USE_REGSET |
| 116 | 116 | ||
| 117 | #define USE_ELF_CORE_DUMP | ||
| 118 | #define ELF_FDPIC_CORE_EFLAGS EF_SH_FDPIC | 117 | #define ELF_FDPIC_CORE_EFLAGS EF_SH_FDPIC |
| 119 | #define ELF_EXEC_PAGESIZE PAGE_SIZE | 118 | #define ELF_EXEC_PAGESIZE PAGE_SIZE |
| 120 | 119 | ||