diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/um/sys-ppc | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/um/sys-ppc')
| -rw-r--r-- | arch/um/sys-ppc/asm/elf.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/um/sys-ppc/asm/elf.h b/arch/um/sys-ppc/asm/elf.h index af9463cd8ce5..8aacaf56508d 100644 --- a/arch/um/sys-ppc/asm/elf.h +++ b/arch/um/sys-ppc/asm/elf.h | |||
| @@ -17,8 +17,6 @@ extern long elf_aux_hwcap; | |||
| 17 | #define ELF_CLASS ELFCLASS32 | 17 | #define ELF_CLASS ELFCLASS32 |
| 18 | #endif | 18 | #endif |
| 19 | 19 | ||
| 20 | #define USE_ELF_CORE_DUMP | ||
| 21 | |||
| 22 | #define R_386_NONE 0 | 20 | #define R_386_NONE 0 |
| 23 | #define R_386_32 1 | 21 | #define R_386_32 1 |
| 24 | #define R_386_PC32 2 | 22 | #define R_386_PC32 2 |