Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[karo-tx-linux.git] / include / linux / elf-em.h

diff --git a/include/linux/elf-em.h b/include/linux/elf-em.h
index 114a96d25652200ab797b35ed01eab2dabac1e05..0311bad838b112cf7aedc2fa9a7c7b9749156ceb 100644 (file)
--- a/include/linux/elf-em.h
+++ b/include/linux/elf-em.h
@@ -11,7 +11,12 @@
 #define EM_486         6       /* Perhaps disused */
 #define EM_860         7
 #define EM_MIPS                8       /* MIPS R3000 (officially, big-endian only) */
+                               /* Next two are historical and binaries and
+                                  modules of these types will be rejected by
+                                  Linux.  */
+#define EM_MIPS_RS3_LE 10      /* MIPS R3000 little-endian */
 #define EM_MIPS_RS4_BE 10      /* MIPS R4000 big-endian */
+
 #define EM_PARISC      15      /* HPPA */
 #define EM_SPARC32PLUS 18      /* Sun's "v8plus" */
 #define EM_PPC         20      /* PowerPC */
@@ -25,7 +30,9 @@
 #define EM_V850                87      /* NEC v850 */
 #define EM_M32R                88      /* Renesas M32R */
 #define EM_H8_300      46      /* Renesas H8/300,300H,H8S */
+#define EM_BLACKFIN     106     /* ADI Blackfin Processor */
 #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