diff options
author | Josh Boyer <jwboyer@redhat.com> | 2011-08-01 08:11:27 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2011-08-01 08:11:27 -0400 |
commit | 3575ffb1af792af94c2cd2aec24dc9d4339337e2 (patch) | |
tree | e4490283c2c0d6135ea3cb4134d6584c0b32cc6a /config-generic | |
parent | 0b39172ce2202bf4720ea65dba8b1d098c198acf (diff) | |
download | kernel-3575ffb1af792af94c2cd2aec24dc9d4339337e2.tar.gz kernel-3575ffb1af792af94c2cd2aec24dc9d4339337e2.tar.xz kernel-3575ffb1af792af94c2cd2aec24dc9d4339337e2.zip |
3.0-git14 snapshot
Add scary cow back to remind people we're branched now
Diffstat (limited to 'config-generic')
-rw-r--r-- | config-generic | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config-generic b/config-generic index 58eb5c9c0..250a81ff7 100644 --- a/config-generic +++ b/config-generic @@ -528,6 +528,7 @@ CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m CONFIG_SCSI_MVSAS=m # CONFIG_SCSI_MVSAS_DEBUG is not set +CONFIG_SCSI_MVSAS_TASKLET=y CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 CONFIG_SCSI_MPT2SAS_LOGGING=y @@ -2245,6 +2246,7 @@ CONFIG_SENSORS_LM93=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m @@ -2275,6 +2277,7 @@ CONFIG_SENSORS_W83792D=m CONFIG_SENSORS_W83793=m CONFIG_SENSORS_LTC4215=m CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_TMP421=m CONFIG_SENSORS_WM8350=m CONFIG_SENSORS_WM831X=m @@ -2310,8 +2313,10 @@ CONFIG_SENSORS_EMC6W201=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_LM25066=m CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_MAX1668=m # CONFIG_HMC6352 is not set # CONFIG_BMP085 is not set |