[linuxdc-cvs] CVS: linux-sh-dc AGAINST-2.4.20-pre11,NONE,1.1.2.1 ChangeLog.dc,1.56.2.1,1.56.2.2 Makefile,1.2.2.1,1.2.2.2 AGAINST-2.4.19,1.1.2.1,NONE

[M. R. B. <mr...@us...>]

Update of /cvsroot/linuxdc/linux-sh-dc
In directory usw-pr-cvs1:/tmp/cvs-serv18863

Modified Files:
      Tag: linux-sh-dc-2_4-branch
	ChangeLog.dc Makefile 
Added Files:
      Tag: linux-sh-dc-2_4-branch
	AGAINST-2.4.20-pre11 
Removed Files:
      Tag: linux-sh-dc-2_4-branch
	AGAINST-2.4.19 
Log Message:
Linux-SH 2.4.20-pre11

--- NEW FILE: AGAINST-2.4.20-pre11 ---

Index: ChangeLog.dc
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/ChangeLog.dc,v
retrieving revision 1.56.2.1
retrieving revision 1.56.2.2
diff -u -d -r1.56.2.1 -r1.56.2.2
--- ChangeLog.dc	26 Oct 2002 12:36:11 -0000	1.56.2.1
+++ ChangeLog.dc	26 Oct 2002 14:14:00 -0000	1.56.2.2
@@ -1,5 +1,16 @@
 2002-10-26  M. R. Brown  <mr...@li...>
 
+	Linux-SH 2.4.20-pre11
+
+	* AGAINST-2.4.20-pre11: New file.
+	* AGAINST-2.4.19: Remove.
+
+	* Documentation/Configure.help, Makefile, arch/sh/config.in,
+	drivers/char/drm/Config.in, drivers/char/drm/Makefile,
+	drivers/char/Makefile, drivers/mtd/maps/Config.in,
+	drivers/mtd/maps/Makefile, drivers/sound/Config.in: Merge changes from
+	Linux-SH 2.4.20-pre11.
+
 	Linux-SH 2.4.19
 
 	* AGAINST-2.4.19: New file.

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/Makefile,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- Makefile	26 Oct 2002 12:36:11 -0000	1.2.2.1
+++ Makefile	26 Oct 2002 14:14:00 -0000	1.2.2.2
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
-SUBLEVEL = 19
-EXTRAVERSION = -sh-dc
+SUBLEVEL = 20
+EXTRAVERSION = -pre11-sh-dc
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
@@ -170,7 +170,7 @@
 DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
 DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
 DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
-DRIVERS-$(CONFIG_PPC) += drivers/macintosh/macintosh.o
+DRIVERS-$(CONFIG_PPC32) += drivers/macintosh/macintosh.o
 DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
 DRIVERS-$(CONFIG_ISAPNP) += drivers/pnp/pnp.o
 DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/sgi.a
@@ -180,11 +180,13 @@
 DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a
 DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
 DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
+DRIVERS-$(CONFIG_HIL) += drivers/hil/hil.o
 DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o
 DRIVERS-$(CONFIG_IRDA) += drivers/net/irda/irda.o
 DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o
 DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o
 DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o
+DRIVERS-$(CONFIG_GSC) += drivers/gsc/gscbus.o
 DRIVERS-$(CONFIG_BLUEZ) += drivers/bluetooth/bluetooth.o
 DRIVERS-$(CONFIG_HOTPLUG_PCI) += drivers/hotplug/vmlinux-obj.o
 DRIVERS-$(CONFIG_ISDN_BOOL) += drivers/isdn/vmlinux-obj.o
@@ -259,7 +261,7 @@
 # 'kbuild_2_4_nostdinc :=' or -I/usr/include for kernel code and you are not UML
 # then your code is broken!  KAO.
 
-kbuild_2_4_nostdinc	:= -nostdinc $(shell $(CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp')
+kbuild_2_4_nostdinc	:= -nostdinc -iwithprefix include
 export kbuild_2_4_nostdinc
 
 export	CPPFLAGS CFLAGS CFLAGS_KERNEL AFLAGS AFLAGS_KERNEL
@@ -370,7 +372,7 @@
 TAGS: dummy
 	{ find include/asm-${ARCH} -name '*.h' -print ; \
 	find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print ; \
-	find $(SUBDIRS) init arch/${ARCH} -name '*.[chS]' ; } | grep -v SCCS | etags -
+	find $(SUBDIRS) init arch/${ARCH} -name '*.[chS]' ; } | grep -v SCCS | grep -v '\.svn' | etags -
 
 # Exuberant ctags works better with -I
 tags: dummy
@@ -488,7 +490,7 @@
 
 dep-files: scripts/mkdep archdep include/linux/version.h
 	scripts/mkdep -- init/*.c > .depend
-	scripts/mkdep -- `find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
+	scripts/mkdep -- `find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
 	$(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)"
 ifdef CONFIG_MODVERSIONS
 	$(MAKE) update-modverfile

--- AGAINST-2.4.19 DELETED ---