[linuxsh-dev] 2.5.9

[NIIBE Y. <gn...@m1...>]

Changes from mainline.

2002-04-23  NIIBE Yutaka  <gn...@m1...>

	* AGAINST-2.5.9: New file.
	* AGAINST-2.5.8: Removed.
	* Makefile: Version 2.5.9.
	* drivers/char/Makefile: Incorporate changes in 2.5.9.
	* drivers/pci/pci.ids: Likewise.
	* include/asm-sh/errno.h (E2BIG): Follow the change of i386 version.

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/Makefile,v
retrieving revision 1.16
diff -u -3 -p -r1.16 Makefile
--- Makefile	23 Apr 2002 04:25:27 -0000	1.16
+++ Makefile	23 Apr 2002 04:32:46 -0000
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 8
+SUBLEVEL = 9
 EXTRAVERSION =-sh
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -348,9 +348,9 @@ fs lib mm ipc kernel drivers net sound: 
 	$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" $(subst $@, _dir_$@, $@)
 
 TAGS: dummy
-	etags `find include/asm-$(ARCH) -name '*.h'`
-	find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs etags -a
-	find $(SUBDIRS) init -name '*.[ch]' | xargs etags -a
+	{ find include/asm-${ARCH} -name '*.h' -print ; \
+	find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print ; \
+	find $(SUBDIRS) init -name '*.[ch]' ; } | grep -v SCCS | etags -
 
 # Exuberant ctags works better with -I
 tags: dummy
Index: drivers/char/Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/char/Makefile,v
retrieving revision 1.4
diff -u -3 -p -r1.4 Makefile
--- drivers/char/Makefile	22 Mar 2002 04:44:45 -0000	1.4
+++ drivers/char/Makefile	23 Apr 2002 04:32:46 -0000
@@ -1,13 +1,6 @@
 #
 # Makefile for the kernel character device drivers.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now inherited from the
-# parent makes..
-#
 
 #
 # This file contains the font map for the default (hardware) font
@@ -26,8 +19,6 @@ export-objs     :=	busmouse.o console.o 
 			sonypi.o tty_io.o tty_ioctl.o generic_serial.o rtc.o
 
 mod-subdirs	:=	ftape drm pcmcia
-
-list-multi	:=	
 
 KEYMAP   =defkeymap.o
 KEYBD    =pc_keyb.o
Index: drivers/pci/pci.ids
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/pci/pci.ids,v
retrieving revision 1.7
diff -u -3 -p -r1.7 pci.ids
--- drivers/pci/pci.ids	5 Apr 2002 04:45:00 -0000	1.7
+++ drivers/pci/pci.ids	23 Apr 2002 04:32:46 -0000
@@ -931,6 +931,9 @@
 	121a  NetServer SMIC Controller
 	121b  NetServer Legacy COM Port Decoder
 	121c  NetServer PCI COM Port Decoder
+	1229  zx1 System Bus Adapter
+	122a  zx1 I/O Controller
+	122e  zx1 Local Bus Adapter
 	2910  E2910A
 	2925  E2925A
 103e  Solliday Engineering
Index: include/asm-sh/errno.h
===================================================================
RCS file: /cvsroot/linuxsh/linux/include/asm-sh/errno.h,v
retrieving revision 1.1.1.1
diff -u -3 -p -r1.1.1.1 errno.h
--- include/asm-sh/errno.h	15 Oct 2001 20:45:07 -0000	1.1.1.1
+++ include/asm-sh/errno.h	23 Apr 2002 04:32:46 -0000
@@ -7,7 +7,7 @@
 #define	EINTR		 4	/* Interrupted system call */
 #define	EIO		 5	/* I/O error */
 #define	ENXIO		 6	/* No such device or address */
-#define	E2BIG		 7	/* Arg list too long */
+#define	E2BIG		 7	/* Argument list too long */
 #define	ENOEXEC		 8	/* Exec format error */
 #define	EBADF		 9	/* Bad file number */
 #define	ECHILD		10	/* No child processes */