rpms/kernel/devel/configs config-generic,1.260,1.261

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv24570/configs

Modified Files:
	config-generic 
Log Message:
disable w1


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- config-generic	17 Nov 2006 16:41:43 -0000	1.260
+++ config-generic	17 Nov 2006 20:38:29 -0000	1.261
@@ -1673,7 +1673,10 @@
 CONFIG_SENSORS_W83791D=m
 CONFIG_SENSORS_W83792D=m
 
-CONFIG_W1=m
+# This is busted.
+# If we enable it, it steals Matrox cards, and the
+# framebuffer drivers stop working.
+# CONFIG_W1=m
 CONFIG_W1_MASTER_MATROX=m
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_SLAVE_THERM=m