Update of /cvsroot/linux-vax/kernel-2.5/drivers
In directory sc8-pr-cvs1:/tmp/cvs-serv17870/drivers
Modified Files:
Makefile
Log Message:
Merge with 2.5.71
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile 28 Aug 2003 22:30:25 -0000 1.22
+++ Makefile 7 Sep 2003 15:00:49 -0000 1.23
@@ -31,7 +31,7 @@
obj-$(CONFIG_DIO) += dio/
obj-$(CONFIG_SBUS) += sbus/
obj-$(CONFIG_ZORRO) += zorro/
-obj-$(CONFIG_ALL_PPC) += macintosh/
+obj-$(CONFIG_PPC_PMAC) += macintosh/
obj-$(CONFIG_MAC) += macintosh/
obj-$(CONFIG_SGI) += sgi/
obj-$(CONFIG_PARIDE) += block/paride/
@@ -46,7 +46,6 @@
obj-$(CONFIG_PHONE) += telephony/
obj-$(CONFIG_MD) += md/
obj-$(CONFIG_BT) += bluetooth/
-obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
obj-$(CONFIG_ISDN_BOOL) += isdn/
obj-$(CONFIG_MCA) += mca/
obj-$(CONFIG_EISA) += eisa/
|
