[Linuxconsole-commit]CVS: ruby/linux/drivers Makefile,1.38,1.39

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers
In directory sc8-pr-cvs1:/tmp/cvs-serv10917/linux/drivers

Modified Files:
	Makefile 
Log Message:
Synced to 2.5.51

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/Makefile,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Makefile	23 Nov 2002 00:55:50 -0000	1.38
+++ Makefile	10 Dec 2002 21:06:14 -0000	1.39
@@ -8,6 +8,9 @@
 obj-$(CONFIG_PCI)		+= pci/
 obj-$(CONFIG_PARISC)		+= parisc/
 obj-$(CONFIG_ACPI)		+= acpi/
+# PnP must come after ACPI since it will eventually need to check if acpi
+# was used and do nothing if so
+obj-$(CONFIG_PNP)		+= pnp/
 obj-y				+= serial/
 obj-$(CONFIG_PARPORT)		+= parport/
 obj-y				+= base/ char/ block/ misc/ net/ media/
@@ -18,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/
@@ -26,9 +29,7 @@
 obj-$(CONFIG_ZORRO)		+= zorro/
 obj-$(CONFIG_ALL_PPC)		+= macintosh/
 obj-$(CONFIG_MAC)		+= macintosh/
-obj-$(CONFIG_PNP)		+= pnp/
 obj-$(CONFIG_SGI)		+= sgi/
-obj-$(CONFIG_VT)		+= video/
 obj-$(CONFIG_PARIDE) 		+= block/paride/
 obj-$(CONFIG_TC)		+= tc/
 obj-$(CONFIG_USB)		+= usb/
@@ -42,5 +43,6 @@
 obj-$(CONFIG_BT)		+= bluetooth/
 obj-$(CONFIG_HOTPLUG_PCI)	+= hotplug/
 obj-$(CONFIG_ISDN_BOOL)		+= isdn/
+obj-$(CONFIG_MCA)		+= mca/
 
 include $(TOPDIR)/Rules.make