[LV-commit] CVS: kernel-2.5/drivers Makefile,1.16,1.17

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

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

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.51


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile	26 Jun 2003 23:05:54 -0000	1.16
+++ Makefile	7 Jul 2003 23:47:31 -0000	1.17
@@ -21,7 +21,7 @@
 obj-$(CONFIG_SCSI)		+= scsi/
 obj-$(CONFIG_FUSION)		+= message/
 obj-$(CONFIG_IEEE1394)		+= ieee1394/
-obj-y				+= cdrom/
+obj-y				+= cdrom/ video/
 obj-$(CONFIG_MTD)		+= mtd/
 obj-$(CONFIG_PCMCIA)		+= pcmcia/
 obj-$(CONFIG_DIO)		+= dio/
@@ -30,7 +30,6 @@
 obj-$(CONFIG_ALL_PPC)		+= macintosh/
 obj-$(CONFIG_MAC)		+= macintosh/
 obj-$(CONFIG_SGI)		+= sgi/
-obj-$(CONFIG_VT)		+= video/
 obj-$(CONFIG_PARIDE) 		+= block/paride/
 obj-$(CONFIG_TC)		+= tc/
 obj-$(CONFIG_USB)		+= usb/
@@ -44,6 +43,7 @@
 obj-$(CONFIG_BT)		+= bluetooth/
 obj-$(CONFIG_HOTPLUG_PCI)	+= hotplug/
 obj-$(CONFIG_ISDN_BOOL)		+= isdn/
+obj-$(CONFIG_MCA)		+= mca/
 
 # VAX-specific stuff
 obj-$(CONFIG_VAX)		+= vax/