Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1:/tmp/cvs-serv18184
Modified Files:
Makefile Rules.make
Log Message:
Merge with 2.5.13
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile 15 Dec 2002 00:41:33 -0000 1.16
+++ Makefile 16 Dec 2002 01:05:59 -0000 1.17
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 5
-SUBLEVEL = 12
+SUBLEVEL = 13
EXTRAVERSION =
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -142,7 +142,7 @@
DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o
DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o
-DRIVERS-$(CONFIG_APPLETALK) += drivers/net/appletalk/appletalk.o
+DRIVERS-$(CONFIG_DEV_APPLETALK) += drivers/net/appletalk/appletalk.o
DRIVERS-$(CONFIG_TR) += drivers/net/tokenring/tr.o
DRIVERS-$(CONFIG_WAN) += drivers/net/wan/wan.o
DRIVERS-$(CONFIG_ARCNET) += drivers/net/arcnet/arcnetdrv.o
Index: Rules.make
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Rules.make,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Rules.make 14 Dec 2002 23:06:05 -0000 1.7
+++ Rules.make 16 Dec 2002 01:05:59 -0000 1.8
@@ -191,21 +191,19 @@
MOD_DESTDIR := $(shell $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh)
endif
-unexport MOD_DIRS
-MOD_DIRS := $(MOD_SUB_DIRS) $(MOD_IN_SUB_DIRS)
-ifneq "$(strip $(MOD_DIRS))" ""
-.PHONY: $(patsubst %,_modsubdir_%,$(MOD_DIRS))
-$(patsubst %,_modsubdir_%,$(MOD_DIRS)) : dummy
+ifneq "$(strip $(MOD_SUB_DIRS))" ""
+.PHONY: $(patsubst %,_modsubdir_%,$(MOD_SUB_DIRS))
+$(patsubst %,_modsubdir_%,$(MOD_SUB_DIRS)) : dummy
$(MAKE) -C $(patsubst _modsubdir_%,%,$@) modules
-.PHONY: $(patsubst %,_modinst_%,$(MOD_DIRS))
-$(patsubst %,_modinst_%,$(MOD_DIRS)) : dummy
+.PHONY: $(patsubst %,_modinst_%,$(MOD_SUB_DIRS))
+$(patsubst %,_modinst_%,$(MOD_SUB_DIRS)) : dummy
$(MAKE) -C $(patsubst _modinst_%,%,$@) modules_install
endif
.PHONY: modules
modules: $(obj-m) dummy \
- $(patsubst %,_modsubdir_%,$(MOD_DIRS))
+ $(patsubst %,_modsubdir_%,$(MOD_SUB_DIRS))
.PHONY: _modinst__
_modinst__: dummy
@@ -216,7 +214,7 @@
.PHONY: modules_install
modules_install: _modinst__ \
- $(patsubst %,_modinst_%,$(MOD_DIRS))
+ $(patsubst %,_modinst_%,$(MOD_SUB_DIRS))
#
# A rule to do nothing
|
