[GFS2] Fix up merge of Linus' kernel into GFS2

[linux-2.6-omap-h63xx.git] / include / linux / elf-em.h

diff --git a/include/linux/elf-em.h b/include/linux/elf-em.h
index 114a96d25652200ab797b35ed01eab2dabac1e05..6a5796c81c900c97ead2d871a6f612c398391afa 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 */