[kernel/f17] Reenable W1 drivers. (rhbz 849430)

[Dave Jones]

commit db67df2ee4c515055cb99afced066be3a937e84f
Author: Dave Jones <davej at redhat.com>
Date:   Mon Aug 20 12:03:22 2012 -0400

    Reenable W1 drivers. (rhbz 849430)

 config-generic |   19 ++++++++++++++++++-
 kernel.spec    |    3 +++
 mod-extra.list |   15 +++++++++++++++
 sources        |    1 -
 4 files changed, 36 insertions(+), 2 deletions(-)
---
diff --git a/config-generic b/config-generic
index 778535a..36c8169 100644
--- a/config-generic
+++ b/config-generic
@@ -2319,7 +2319,24 @@ CONFIG_SENSORS_MAX1668=m
 # CONFIG_SERIAL_PCH_UART is not set
 # CONFIG_USB_SWITCH_FSA9480 is not set
 
-# CONFIG_W1 is not set
+CONFIG_W1=m
+CONFIG_W1_CON=y
+# CONFIG_W1_MASTER_MATROX is not set
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2408=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_BQ27000=m
 
 #
 # Mice
diff --git a/kernel.spec b/kernel.spec
index 9054362..d8b3597 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2339,6 +2339,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Mon Aug 20 2012 Dave Jones <davej at redhat.com>
+- Reenable W1 drivers. (rhbz 849430)
+
 * Wed Aug 15 2012 Dave Jones <davej at redhat.com> 3.5.2-1
 - Linux 3.5.2
 
diff --git a/mod-extra.list b/mod-extra.list
index 293e192..098e004 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -170,3 +170,18 @@ tpm_infineon.ko
 tpm_nsc.ko
 tpm_tis.ko
 slip.ko
+wire.ko
+ds1wm.ko
+ds2490.ko
+ds2482.ko
+w1_ds2780.ko
+w1_therm.ko
+w1_ds2433.ko
+w1_ds2760.ko
+w1_ds28e04.ko
+w1_ds2408.ko
+w1_ds2781.ko
+w1_smem.ko
+w1_ds2431.ko
+w1_ds2423.ko
+w1_bq27000.ko
diff --git a/sources b/sources
index d59993f..c067ede 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 24153eaaa81dedc9481ada8cd9c3b83d  linux-3.5.tar.xz
-35add5b2e64d1cbc8d123980c967e7ca  patch-3.5.1.xz
 8e9f9cfd5fbd33ac4b265a4d47949edc  patch-3.5.2.xz