diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-05-24 09:22:20 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-05-24 09:22:20 -0400 |
| commit | 83d968d7e9374fe665cc27fa80bdf8b0e093f318 (patch) | |
| tree | 6b8d55e1b8f753e109976f2449fb0d64eed97a87 /config-generic | |
| parent | 440886d0908f9f900d0fcd4b77d0838e940df7d6 (diff) | |
| download | kernel-83d968d7e9374fe665cc27fa80bdf8b0e093f318.tar.gz kernel-83d968d7e9374fe665cc27fa80bdf8b0e093f318.tar.xz kernel-83d968d7e9374fe665cc27fa80bdf8b0e093f318.zip | |
Linux v3.4-5722-gf936991
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config-generic b/config-generic index 00e4489ee..c98215661 100644 --- a/config-generic +++ b/config-generic @@ -2246,6 +2246,7 @@ CONFIG_SENSORS_WM8350=m CONFIG_SENSORS_WM831X=m CONFIG_SENSORS_LM73=m CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_ADT7411=m CONFIG_SENSORS_ASC7621=m CONFIG_SENSORS_EMC1403=m @@ -4044,6 +4045,8 @@ CONFIG_PM_TRACE_RTC=y CONFIG_PM_TEST_SUSPEND=y CONFIG_PM_RUNTIME=y # CONFIG_PM_OPP is not set +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_WAKELOCKS is not set CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y @@ -4467,6 +4470,7 @@ CONFIG_TEST_KSTRTOX=y CONFIG_TARGET_CORE=m CONFIG_ISCSI_TARGET=m CONFIG_LOOPBACK_TARGET=m +CONFIG_SBP_TARGET=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m CONFIG_TCM_PSCSI=m |