Update of /cvsroot/linux-vax/kernel-2.5/drivers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20011/drivers
Modified Files:
Makefile
Log Message:
Merge with 2.6.11
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Makefile 21 Mar 2005 23:44:08 -0000 1.32
+++ Makefile 28 Mar 2005 00:00:57 -0000 1.33
@@ -42,6 +42,7 @@
obj-$(CONFIG_SBUS) += sbus/
obj-$(CONFIG_ZORRO) += zorro/
obj-$(CONFIG_MAC) += macintosh/
+obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/
obj-$(CONFIG_PARIDE) += block/paride/
obj-$(CONFIG_TC) += tc/
obj-$(CONFIG_USB) += usb/
@@ -57,9 +58,11 @@
obj-$(CONFIG_ISDN) += isdn/
obj-$(CONFIG_MCA) += mca/
obj-$(CONFIG_EISA) += eisa/
+obj-$(CONFIG_VAX) += vax/
obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_MMC) += mmc/
+obj-$(CONFIG_INFINIBAND) += infiniband/
obj-y += firmware/
+obj-$(CONFIG_CRYPTO) += crypto/
# VAX-specific stuff
-obj-$(CONFIG_VAX) += vax/
|
