git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
include
/
linux
/
elf-em.h
diff --git
a/include/linux/elf-em.h
b/include/linux/elf-em.h
index
6a5796c
..
666e0a5
100644
(file)
--- a/
include/linux/elf-em.h
+++ b/
include/linux/elf-em.h
@@
-31,6
+31,7
@@
#define EM_M32R 88 /* Renesas M32R */
#define EM_H8_300 46 /* Renesas H8/300,300H,H8S */
#define EM_FRV 0x5441 /* Fujitsu FR-V */
+#define EM_AVR32 0x18ad /* Atmel AVR32 */
/*
* This is an interim value that we will use until the committee comes