[LV-k25-commit] CVS: kernel-2.5/drivers Makefile,1.7,1.8

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers
In directory sc8-pr-cvs1:/tmp/cvs-serv8635/drivers

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.15


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile	4 Dec 2002 10:48:49 -0000	1.7
+++ Makefile	30 Dec 2002 03:02:37 -0000	1.8
@@ -7,8 +7,9 @@
 
 
 mod-subdirs :=	dio mtd sbus video macintosh usb input telephony sgi ide \
-		message/i2o message/fusion scsi md ieee1394 pnp isdn atm \
-		fc4 net/hamradio i2c acpi bluetooth input/serio input/gameport
+		message scsi md ieee1394 pnp isdn atm \
+		fc4 i2c acpi bluetooth input/serio \
+		input/gameport parport hotplug
 
 subdir-y :=	base parport char block net misc media cdrom hotplug
 subdir-m :=	$(subdir-y)
@@ -33,8 +34,8 @@
 subdir-$(CONFIG_SGI)		+= sgi
 subdir-$(CONFIG_IDE)		+= ide
 subdir-$(CONFIG_SCSI)		+= scsi
-subdir-$(CONFIG_I2O)		+= message/i2o
-subdir-$(CONFIG_FUSION)		+= message/fusion
+subdir-$(CONFIG_I2O)		+= message
+subdir-$(CONFIG_FUSION)		+= message
 subdir-$(CONFIG_MD)		+= md
 subdir-$(CONFIG_IEEE1394)	+= ieee1394
 subdir-$(CONFIG_PNP)		+= pnp
@@ -44,8 +45,6 @@
 subdir-$(CONFIG_VAX)		+= vax
 subdir-$(CONFIG_VSBUS)		+= vsbus
 
-# CONFIG_HAMRADIO can be set without CONFIG_NETDEVICE being set  -- ch
-subdir-$(CONFIG_HAMRADIO)	+= net/hamradio
 subdir-$(CONFIG_I2C)		+= i2c
 subdir-$(CONFIG_ACPI)		+= acpi