[Gc-linux-cvs] linux/drivers Makefile,1.6,1.7

[<aot...@us...>]

Update of /cvsroot/gc-linux/linux/drivers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16634/drivers

Modified Files:
	Makefile 
Log Message:
Merge 2.6.11

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	4 Jan 2005 21:39:13 -0000	1.6
+++ Makefile	3 Mar 2005 21:12:50 -0000	1.7
@@ -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/
@@ -59,5 +60,7 @@
 obj-$(CONFIG_EISA)		+= eisa/
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
 obj-$(CONFIG_MMC)		+= mmc/
+obj-$(CONFIG_INFINIBAND)	+= infiniband/
 obj-y				+= firmware/
+obj-$(CONFIG_CRYPTO)		+= crypto/
 obj-$(CONFIG_EXI)		+= exi/