rpms/kernel/F-8 config-generic,1.60,1.61 kernel.spec,1.420,1.421

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17670

Modified Files:
	config-generic kernel.spec 
Log Message:
* Mon Apr 07 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.24.4-75
- Enable the 1-wire drivers (except for the Matrox driver which conflicts
  with the Matrox framebuffer driver.) (#441047)



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-generic,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- config-generic	2 Apr 2008 02:52:21 -0000	1.60
+++ config-generic	7 Apr 2008 04:32:02 -0000	1.61
@@ -1860,18 +1860,20 @@
 CONFIG_SENSORS_W83792D=m
 CONFIG_SENSORS_W83793=m
 
+CONFIG_W1=m
+CONFIG_W1_CON=y
 # This is busted.
 # If we enable it, it steals Matrox cards, and the
 # framebuffer drivers stop working.
-# CONFIG_W1 is not set
-CONFIG_W1_MASTER_MATROX=m
+# CONFIG_W1_MASTER_MATROX is not set
 CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
 CONFIG_W1_SLAVE_DS2433=m
 CONFIG_W1_SLAVE_DS2433_CRC=y
-CONFIG_W1_CON=y
-CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_SLAVE_DS2760=m
 
 #
 # Mice


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -r1.420 -r1.421
--- kernel.spec	3 Apr 2008 03:48:13 -0000	1.420
+++ kernel.spec	7 Apr 2008 04:32:02 -0000	1.421
@@ -2009,6 +2009,10 @@
 
 
 %changelog
+* Mon Apr 07 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.24.4-75
+- Enable the 1-wire drivers (except for the Matrox driver which conflicts
+  with the Matrox framebuffer driver.) (#441047)
+
 * Wed Apr 02 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.24.4-74
 - Disable sound card debugging messages. (#439592)