History

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

Linus Torvalds committed 11 years ago

Commit 573c5772 parents 0cdf5a4 b1413272 files · +3 −1Browse files

Showing the changes to include/uapi (1 of 2 files). Show all

Unified · Split

include/uapi/linux/elf-em.h+1−0
@@ -39,6 +39,7 @@ · 38 unmodified lines
39#define EM_TI_C6000 140 /* TI C6X DSPs */39#define EM_TI_C6000 140 /* TI C6X DSPs */
40#define EM_AARCH64 183 /* ARM 64 bit */40#define EM_AARCH64 183 /* ARM 64 bit */
41#define EM_TILEPRO 188 /* Tilera TILEPro */41#define EM_TILEPRO 188 /* Tilera TILEPro */
42#define EM_MICROBLAZE 189 /* Xilinx MicroBlaze */
42#define EM_TILEGX 191 /* Tilera TILE-Gx */43#define EM_TILEGX 191 /* Tilera TILE-Gx */
43#define EM_FRV 0x5441 /* Fujitsu FR-V */44#define EM_FRV 0x5441 /* Fujitsu FR-V */
44#define EM_AVR32 0x18ad /* Atmel AVR32 */45#define EM_AVR32 0x18ad /* Atmel AVR32 */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t