[LV-commit] CVS: kernel-2.4/include/linux elf.h,1.2,1.3

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv9637/include/linux

Modified Files:
	elf.h 
Log Message:
Merge Linus' official 2.4.2 tree


Index: elf.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/linux/elf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- elf.h	2001/01/23 16:54:24	1.2
+++ elf.h	2001/02/26 02:28:27	1.3
@@ -76,6 +76,8 @@
 
 #define EM_VAX		75      /* Digital Equipment Corp VAX - used to be 780 */
 
+#define EM_CRIS         76      /* Axis Communications 32-bit embedded processor */
+
 /*
  * This is an interim value that we will use until the committee comes
  * up with a final number.