Update of /cvsroot/linux-vax/kernel-2.4
In directory usw-pr-cvs1:/tmp/cvs-serv9637
Modified Files:
Makefile
Log Message:
Merge Linus' official 2.4.2 tree
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile 2001/02/22 23:30:17 1.9
+++ Makefile 2001/02/26 02:28:26 1.10
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 4
-SUBLEVEL = 0
-EXTRAVERSION = -20010221
+SUBLEVEL = 2
+EXTRAVERSION = -20010226
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -111,8 +111,7 @@
export SVGA_MODE = -DSVGA_MODE=NORMAL_VGA
#
-# if you want the RAM disk device, define this to be the
-# size in blocks.
+# If you want the RAM disk device, define this to be the size in blocks.
# This is i386 specific.
#
@@ -140,9 +139,9 @@
DRIVERS-$(CONFIG_ISDN) += drivers/isdn/isdn.a
DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o
DRIVERS-$(CONFIG_APPLETALK) += drivers/net/appletalk/appletalk.o
-DRIVERS-$(CONFIG_TR) += drivers/net/tokenring/tr.a
+DRIVERS-$(CONFIG_TR) += drivers/net/tokenring/tr.o
DRIVERS-$(CONFIG_WAN) += drivers/net/wan/wan.o
-DRIVERS-$(CONFIG_ARCNET) += drivers/net/arcnet/arcnet.a
+DRIVERS-$(CONFIG_ARCNET) += drivers/net/arcnet/arcnetdrv.o
DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
@@ -463,9 +462,8 @@
depend dep: dep-files
-# make checkconfig: Prune 'scripts' directory to avoid "false positives".
checkconfig:
- find * -name '*.[hcS]' -type f -print | grep -v scripts/ | sort | xargs $(PERL) -w scripts/checkconfig.pl
+ find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkconfig.pl
checkhelp:
find * -name [cC]onfig.in -print | sort | xargs $(PERL) -w scripts/checkhelp.pl
|
