From 838cf17bb622c890b76150317a56867d1304cc44 Mon Sep 17 00:00:00 2001
From: Mark Salter <msalter@redhat.com>
Date: Tue, 27 Sep 2011 12:35:21 -0400
Subject: [PATCH] --- yaml --- r: 283170 b: refs/heads/master c:
 854a68521badc48460c9cbcdf37b220865836ac3 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/elf-em.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ce5bc5431437..9ebaa7e0d974 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7a0556e0f2d6946a57f993c6d1043cf065ccfa8
+refs/heads/master: 854a68521badc48460c9cbcdf37b220865836ac3
diff --git a/trunk/include/linux/elf-em.h b/trunk/include/linux/elf-em.h
index 18bea78fe47b..8e2b7bac4378 100644
--- a/trunk/include/linux/elf-em.h
+++ b/trunk/include/linux/elf-em.h
@@ -33,6 +33,7 @@
 #define EM_H8_300	46	/* Renesas H8/300,300H,H8S */
 #define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */
 #define EM_BLACKFIN     106     /* ADI Blackfin Processor */
+#define EM_TI_C6000	140	/* TI C6X DSPs */
 #define EM_FRV		0x5441	/* Fujitsu FR-V */
 #define EM_AVR32	0x18ad	/* Atmel AVR32 */