kbuild: Remove mod-subdirs variable

mod-subdirs was used to list directories that we needed to descend into 
during 'make modules' even though they were listed in subdir-y (not -m).

Since we now only do one pass for modules and built-in, it's not necessary
anymore and can go away.

24 files changed, 1 insertions, 52 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index 7e672fb2c046..f58647a694ef 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -5,13 +5,6 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-
-mod-subdirs :=	dio mtd sbus video macintosh usb input telephony sgi ide \
-		message scsi md ieee1394 pnp isdn atm \
-		fc4 i2c acpi bluetooth input/serio \
-		input/gameport parport hotplug \
-		base char block misc net media cdrom
-
 obj-$(CONFIG_PCI)		+= pci/
 obj-$(CONFIG_ACPI)		+= acpi/
 obj-$(CONFIG_PARPORT)		+= parport/
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index a570438b199c..23ebf1dca2af 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -17,8 +17,6 @@ export-objs     :=	busmouse.o console.o keyboard.o sysrq.o \
 			sonypi.o tty_io.o tty_ioctl.o generic_serial.o rtc.o \
 			ip2main.o
 
-mod-subdirs	:=	ftape drm pcmcia
-
 KEYMAP   =defkeymap.o
 KEYBD    =pc_keyb.o
 CONSOLE  =console.o
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 90e158f6bd55..bdb70aa4a996 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -4,7 +4,6 @@
 
 # Objects that export symbols.
 
-mod-subdirs	:= joystick
 export-objs	:= input.o
 
 # Each configuration option enables a list of files.
diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile
index b36f539adaca..438d73e64e3a 100644
--- a/drivers/isdn/Makefile
+++ b/drivers/isdn/Makefile
@@ -2,8 +2,6 @@
 
 # Object files in subdirectories
 
-mod-subdirs				:= i4l hisax capi eicon
-
 obj-$(CONFIG_ISDN)			+= i4l/
 obj-$(CONFIG_ISDN_CAPI)			+= capi/
 obj-$(CONFIG_ISDN_CAPI)			+= hardware/
diff --git a/drivers/isdn/hardware/Makefile b/drivers/isdn/hardware/Makefile
index 8266ed78f13f..1c0ab20f7426 100644
--- a/drivers/isdn/hardware/Makefile
+++ b/drivers/isdn/hardware/Makefile
@@ -2,7 +2,6 @@
 
 # Object files in subdirectories
 
-mod-subdirs			:= avm
 obj-$(CONFIG_CAPI_AVM)		+= avm/
 
 # The global Rules.make.
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 60ef7cb4c5ba..2e8e5e21d82f 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-mod-subdirs  := video radio
-
 obj-y        := video/ radio/
 
 include $(TOPDIR)/Rules.make
diff --git a/drivers/message/Makefile b/drivers/message/Makefile
index 743f5d1acab4..8fdb1bfb5e44 100644
--- a/drivers/message/Makefile
+++ b/drivers/message/Makefile
@@ -2,8 +2,6 @@
 # Makefile for MPT based block devices
 #
 
-mod-subdirs := i2o fusion 
-
 obj-$(CONFIG_I2O)	+= i2o/
 obj-$(CONFIG_FUSION)	+= fusion/
 
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 38903a1c4712..4b8108198e7e 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -4,9 +4,6 @@
 #
 # $Id: Makefile,v 1.63 2001/06/13 09:43:07 dwmw2 Exp $
 
-
-mod-subdirs	:= chips maps devices nand
-
 export-objs	:= mtdcore.o mtdpart.o redboot.o bootldr.o afs.o
 
 obj-y           += chips/ maps/	devices/ nand/
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 60cfc470da50..971e65d264c9 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -2,9 +2,6 @@
 # Makefile for the Linux network (ethercard) device drivers.
 #
 
-mod-subdirs     := appletalk arcnet fc irda tokenring tulip pcmcia wireless \
-		   wan ../acorn/net
-
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 
diff --git a/drivers/s390/Makefile b/drivers/s390/Makefile
index efc3a55a47ef..11661c2e0339 100644
--- a/drivers/s390/Makefile
+++ b/drivers/s390/Makefile
@@ -2,12 +2,9 @@
 # Makefile for the S/390 specific device drivers
 #
 
-mod-subdirs := block char misc net scsi cio
-
-export-objs += s390dyn.o
+export-objs := s390dyn.o qdio.o
 
 obj-$(CONFIG_QDIO) += qdio.o
-export-objs += qdio.o
 
 obj-y += s390mach.o s390dyn.o sysinfo.o
 obj-y += block/ char/ misc/ net/ scsi/ cio/
diff --git a/drivers/sbus/Makefile b/drivers/sbus/Makefile
index 9507e0a00eeb..783e9da22266 100644
--- a/drivers/sbus/Makefile
+++ b/drivers/sbus/Makefile
@@ -6,8 +6,6 @@ ifneq ($(ARCH),m68k)
 obj-y    := sbus.o dvma.o
 endif
 
-mod-subdirs := char audio
-
 obj-$(CONFIG_SBUSCHAR) += char/
 obj-$(CONFIG_SPARCAUDIO) += audio/
 
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 7bb214700e8f..3acc6a280329 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -19,8 +19,6 @@ CFLAGS_gdth.o    = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ -DGDTH_STATISTICS
 CFLAGS_seagate.o =   -DARBITRATE -DPARITY -DSEAGATE_USE_ASM
 
 export-objs	:= scsi_syms.o 53c700.o
-mod-subdirs	:= pcmcia ../acorn/scsi
-
 
 subdir-$(CONFIG_PCMCIA)		+= pcmcia
 
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 2965c6ca6965..6a9a440ea3ad 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -3,7 +3,6 @@
 #
 
 # Object files in subdirectories
-mod-subdirs	:= serial
 
 obj-$(CONFIG_USB)		+= core/
 
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 009e0c065c15..11ebb0eb2a8d 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -2,8 +2,6 @@
 # 5 Aug 1999, James Simmons, <mailto:jsimmons@users.sf.net>
 # Rewritten to use lists instead of if-statements.
 
-mod-subdirs	:= matrox
-
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 
diff --git a/fs/Makefile b/fs/Makefile
index edf788e13883..28fe3eb901db 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -9,7 +9,6 @@ O_TARGET := fs.o
 
 export-objs :=	filesystems.o open.o dcache.o buffer.o bio.o inode.o dquot.o \
 		mpage.o
-mod-subdirs :=	nls
 
 obj-y :=	open.o read_write.o devices.o file_table.o buffer.o \
 		bio.o super.o block_dev.o char_dev.o stat.o exec.o pipe.o \
diff --git a/net/Makefile b/net/Makefile
index f8ed1ac9386d..ba80575f90ae 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -7,7 +7,6 @@
 
 O_TARGET :=	network.o
 
-mod-subdirs :=	ipv4 ipv4/netfilter ipv6/netfilter ipx irda bluetooth atm netlink sched
 export-objs :=	netsyms.o
 
 obj-y	:= socket.o core/
diff --git a/sound/Makefile b/sound/Makefile
index 02b2ec90ed51..6806db9b183a 100644
--- a/sound/Makefile
+++ b/sound/Makefile
@@ -5,8 +5,6 @@ O_TARGET := sound.o
 
 export-objs     := sound_core.o
 
-mod-subdirs	:= oss core i2c drivers isa pci ppc synth
-
 obj-$(CONFIG_SOUND) += soundcore.o
 obj-$(CONFIG_SOUND_PRIME) += oss/
 obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/
diff --git a/sound/core/Makefile b/sound/core/Makefile
index 906e72394b76..02baeb69dae9 100644
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@ -5,8 +5,6 @@
 
 export-objs  := sound.o pcm.o pcm_lib.o rawmidi.o timer.o rtctimer.o hwdep.o
 
-mod-subdirs  := oss seq
-
 snd-objs     := sound.o init.o isadma.o memory.o info.o control.o misc.o \
                 device.o wrappers.o
 ifeq ($(CONFIG_SND_OSSEMUL),y)
diff --git a/sound/core/seq/Makefile b/sound/core/seq/Makefile
index f5bf1a52e271..e1b8f7ae1a3d 100644
--- a/sound/core/seq/Makefile
+++ b/sound/core/seq/Makefile
@@ -3,8 +3,6 @@
 # Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
 #
 
-mod-subdirs  := instr
-
 obj-$(CONFIG_SND) += instr/
 obj-$(CONFIG_SND_SEQUENCER_OSS) += oss/
 
diff --git a/sound/drivers/Makefile b/sound/drivers/Makefile
index e392e92057f2..5d8226cab1c6 100644
--- a/sound/drivers/Makefile
+++ b/sound/drivers/Makefile
@@ -3,8 +3,6 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
 #
 
-mod-subdirs  := opl3 mpu401
-
 snd-dummy-objs := dummy.o
 snd-mtpav-objs := mtpav.o
 snd-serial-u16550-objs := serial-u16550.o
diff --git a/sound/i2c/Makefile b/sound/i2c/Makefile
index 889e7aab15ae..156d2cdceb98 100644
--- a/sound/i2c/Makefile
+++ b/sound/i2c/Makefile
@@ -3,8 +3,6 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
 #
 
-mod-subdirs := l3
-
 export-objs  := i2c.o cs8427.o tea6330t.o
 
 snd-i2c-objs := i2c.o
diff --git a/sound/isa/Makefile b/sound/isa/Makefile
index 8e0ef2546ac6..3f7389aea889 100644
--- a/sound/isa/Makefile
+++ b/sound/isa/Makefile
@@ -3,8 +3,6 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
 #
 
-mod-subdirs  := ad1816a ad1848 cs423x es1688 gus opti9xx sb wavefront
-
 snd-als100-objs := als100.o
 snd-azt2320-objs := azt2320.o
 snd-cmi8330-objs := cmi8330.o
diff --git a/sound/pci/Makefile b/sound/pci/Makefile
index 5a1598c92fa5..6c9265602890 100644
--- a/sound/pci/Makefile
+++ b/sound/pci/Makefile
@@ -3,8 +3,6 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
 #
 
-mod-subdirs  := ac97 ali5451 cs46xx emu10k1 korg1212 nm256 rme9652 trident ymfpci
-
 snd-als4000-objs := als4000.o
 snd-cmipci-objs := cmipci.o
 snd-cs4281-objs := cs4281.o
diff --git a/sound/synth/Makefile b/sound/synth/Makefile
index 3e8d32297bbf..40ee15ccdf89 100644
--- a/sound/synth/Makefile
+++ b/sound/synth/Makefile
@@ -3,8 +3,6 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
 #
 
-mod-subdirs  := emux
-
 export-objs  := util_mem.o
 
 snd-util-mem-objs := util_mem.o