rpms/kernel/devel config-generic,1.93,1.94 kernel.spec,1.585,1.586

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17971

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



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- config-generic	2 Apr 2008 01:21:33 -0000	1.93
+++ config-generic	7 Apr 2008 04:37:27 -0000	1.94
@@ -1896,18 +1896,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/devel/kernel.spec,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -r1.585 -r1.586
--- kernel.spec	6 Apr 2008 23:31:32 -0000	1.585
+++ kernel.spec	7 Apr 2008 04:37:27 -0000	1.586
@@ -1758,6 +1758,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Apr 07 2008 Chuck Ebbert <cebbert at redhat.com>
+- Enable the 1-wire drivers (except for the Matrox driver which conflicts
+  with the Matrox framebuffer driver.)
+
 * Sun Apr 06 2008 Dave Jones <davej at redhat.com>
 - 2.6.25-rc8-git4