summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-generic19
-rw-r--r--kernel.spec3
-rw-r--r--mod-extra.list15
3 files changed, 36 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index 20024fbba..d6cb2b7e9 100644
--- a/config-generic
+++ b/config-generic
@@ -2268,7 +2268,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 be6c5b060..16d90a8d7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2305,6 +2305,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Aug 20 2012 Dave Jones <davej@redhat.com>
+- Reenable W1 drivers. (rhbz 849430)
+
* Fri Aug 17 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc2.git0.2
- Reenable debugging options.
diff --git a/mod-extra.list b/mod-extra.list
index c35fb625f..b01f05eb4 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -172,3 +172,18 @@ tpm_tis.ko
slip.ko
nilfs2.ko
batman-adv.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