[LV-k25-commit] kernel-2.5/include/linux elf.h,1.21,1.22

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

Update of /cvsroot/linux-vax/kernel-2.5/include/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16064/include/linux

Modified Files:
	elf.h 
Log Message:
Merge with 2.6.7


Index: elf.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/linux/elf.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- elf.h	18 Jul 2004 21:49:27 -0000	1.21
+++ elf.h	28 Jul 2004 22:56:59 -0000	1.22
@@ -83,8 +83,7 @@
 
 #define EM_V850		87	/* NEC v850 */
 
-#define EM_H8_300H      47      /* Hitachi H8/300H */
-#define EM_H8S          48      /* Hitachi H8S     */
+#define EM_H8_300       46      /* Hitachi H8/300,300H,H8S */
 
 /*
  * This is an interim value that we will use until the committee comes