summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-11 02:20:00 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-11 02:20:00 +0300
commit573c577af079184ca523984e3279644eb37756a3 (patch)
tree7e9da3f937733592032ca6ef6ff95773ab991010 /include
parent0cdf5a464070c8a2980a27113c47fb8e71babb9c (diff)
parentb14132797d8041a42e03f4ffa1e722da1425adfb (diff)
downloadlinux-573c577af079184ca523984e3279644eb37756a3.tar.xz
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze update from Michal Simek. * 'next' of git://git.monstr.eu/linux-2.6-microblaze: elf-em.h: move EM_MICROBLAZE to the common header
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/elf-em.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h
index 3429a3ba382b..b56dfcfe922a 100644
--- a/include/uapi/linux/elf-em.h
+++ b/include/uapi/linux/elf-em.h
@@ -39,6 +39,7 @@
#define EM_TI_C6000 140 /* TI C6X DSPs */
#define EM_AARCH64 183 /* ARM 64 bit */
#define EM_TILEPRO 188 /* Tilera TILEPro */
+#define EM_MICROBLAZE 189 /* Xilinx MicroBlaze */
#define EM_TILEGX 191 /* Tilera TILE-Gx */
#define EM_FRV 0x5441 /* Fujitsu FR-V */
#define EM_AVR32 0x18ad /* Atmel AVR32 */