diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-12-12 03:09:03 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-12-12 03:09:03 -0500 |
| commit | 3459f0d78ffe27a1b341c22eb158b622eaaea3fc (patch) | |
| tree | 715b0575eec541d0181876ad367ca5480cdcecf3 /include/uapi/linux/elf-em.h | |
| parent | 9fc81d87420d0d3fd62d5e5529972c0ad9eab9cc (diff) | |
| parent | bee2782f30f66898be3f74ad02e4d1f87a969694 (diff) | |
Merge branch 'linus' into perf/urgent, to pick up the upstream merged bits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/elf-em.h')
| -rw-r--r-- | include/uapi/linux/elf-em.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h index aa90bc98b6e2..ae99f7743cf4 100644 --- a/include/uapi/linux/elf-em.h +++ b/include/uapi/linux/elf-em.h | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #define EM_MN10300 89 /* Panasonic/MEI MN10300, AM33 */ | 34 | #define EM_MN10300 89 /* Panasonic/MEI MN10300, AM33 */ |
| 35 | #define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */ | 35 | #define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */ |
| 36 | #define EM_BLACKFIN 106 /* ADI Blackfin Processor */ | 36 | #define EM_BLACKFIN 106 /* ADI Blackfin Processor */ |
| 37 | #define EM_ALTERA_NIOS2 113 /* Altera Nios II soft-core processor */ | ||
| 37 | #define EM_TI_C6000 140 /* TI C6X DSPs */ | 38 | #define EM_TI_C6000 140 /* TI C6X DSPs */ |
| 38 | #define EM_AARCH64 183 /* ARM 64 bit */ | 39 | #define EM_AARCH64 183 /* ARM 64 bit */ |
| 39 | #define EM_FRV 0x5441 /* Fujitsu FR-V */ | 40 | #define EM_FRV 0x5441 /* Fujitsu FR-V */ |