diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
| commit | 334d0dd8b660557608142f0f77abc6812b48f08b (patch) | |
| tree | 9393a9aa099d7d42deda5f9f5054796c0c769be7 /include/linux/elf-em.h | |
| parent | 3f07d8796262f6aee135c8dd9a91210da9f888e4 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/elf-em.h')
| -rw-r--r-- | include/linux/elf-em.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/elf-em.h b/include/linux/elf-em.h index 666e0a5f00fc..0311bad838b1 100644 --- a/include/linux/elf-em.h +++ b/include/linux/elf-em.h | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #define EM_V850 87 /* NEC v850 */ | 30 | #define EM_V850 87 /* NEC v850 */ |
| 31 | #define EM_M32R 88 /* Renesas M32R */ | 31 | #define EM_M32R 88 /* Renesas M32R */ |
| 32 | #define EM_H8_300 46 /* Renesas H8/300,300H,H8S */ | 32 | #define EM_H8_300 46 /* Renesas H8/300,300H,H8S */ |
| 33 | #define EM_BLACKFIN 106 /* ADI Blackfin Processor */ | ||
| 33 | #define EM_FRV 0x5441 /* Fujitsu FR-V */ | 34 | #define EM_FRV 0x5441 /* Fujitsu FR-V */ |
| 34 | #define EM_AVR32 0x18ad /* Atmel AVR32 */ | 35 | #define EM_AVR32 0x18ad /* Atmel AVR32 */ |
| 35 | 36 | ||