[Gc-linux-cvs] linux/drivers Makefile,1.10,1.11

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

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

Modified Files:
	Makefile 
Log Message:
Merge 2.6.13

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	6 Jul 2005 18:28:01 -0000	1.10
+++ Makefile	29 Aug 2005 19:50:20 -0000	1.11
@@ -52,6 +52,7 @@
 obj-$(CONFIG_I2O)		+= message/
 obj-$(CONFIG_I2C)		+= i2c/
 obj-$(CONFIG_W1)		+= w1/
+obj-$(CONFIG_HWMON)		+= hwmon/
 obj-$(CONFIG_PHONE)		+= telephony/
 obj-$(CONFIG_MD)		+= md/
 obj-$(CONFIG_BT)		+= bluetooth/
@@ -61,7 +62,7 @@
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
 obj-$(CONFIG_MMC)		+= mmc/
 obj-$(CONFIG_INFINIBAND)	+= infiniband/
-obj-$(CONFIG_BLK_DEV_SGIIOC4)	+= sn/
+obj-$(CONFIG_SGI_IOC4)		+= sn/
 obj-y				+= firmware/
 obj-$(CONFIG_CRYPTO)		+= crypto/
 obj-$(CONFIG_GAMECUBE_SI)	+= input/si/