summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2012-08-20 12:05:53 -0400
committerDave Jones <davej@redhat.com>2012-08-20 12:05:53 -0400
commit341e5eb0777fe5ec20eb878c0ffb68afd93da379 (patch)
treeafb8b1418dcc57d2f9d2024a02f0e5089af8ca2d /config-generic
parent31bd260160825b59410e105f090da6d0df9fc8ad (diff)
downloadkernel-341e5eb0777fe5ec20eb878c0ffb68afd93da379.tar.gz
kernel-341e5eb0777fe5ec20eb878c0ffb68afd93da379.tar.xz
kernel-341e5eb0777fe5ec20eb878c0ffb68afd93da379.zip
Reenable W1 drivers. (rhbz 849430)
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic19
1 files changed, 18 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