diff options
| author | Dave Jones <davej@redhat.com> | 2012-08-20 12:05:53 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2012-08-20 12:05:53 -0400 |
| commit | 341e5eb0777fe5ec20eb878c0ffb68afd93da379 (patch) | |
| tree | afb8b1418dcc57d2f9d2024a02f0e5089af8ca2d | |
| parent | 31bd260160825b59410e105f090da6d0df9fc8ad (diff) | |
| download | kernel-341e5eb0777fe5ec20eb878c0ffb68afd93da379.tar.gz kernel-341e5eb0777fe5ec20eb878c0ffb68afd93da379.tar.xz kernel-341e5eb0777fe5ec20eb878c0ffb68afd93da379.zip | |
Reenable W1 drivers. (rhbz 849430)
| -rw-r--r-- | config-generic | 19 | ||||
| -rw-r--r-- | kernel.spec | 3 | ||||
| -rw-r--r-- | mod-extra.list | 15 |
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 |