diff options
author | Laura Abbott <labbott@fedoraproject.org> | 2016-05-17 09:35:57 -0700 |
---|---|---|
committer | Laura Abbott <labbott@fedoraproject.org> | 2016-05-17 09:35:57 -0700 |
commit | 01027370551133b74c154efd23fff29d859efcf2 (patch) | |
tree | eaa2088000efcc6c37b67adfb4e1c0f77e7a5cee /config-generic | |
parent | c3b50ba0e0c85eb5eee49ceae99d401183243fc3 (diff) | |
download | kernel-01027370551133b74c154efd23fff29d859efcf2.tar.gz kernel-01027370551133b74c154efd23fff29d859efcf2.tar.xz kernel-01027370551133b74c154efd23fff29d859efcf2.zip |
Linux v4.6-1278-g1649098
- Enable CONFIG_INTEL_POWERCLAMP
- pm, ACPI, mmc, regulator, i2c, hwmon, edac, led, arm64, x86, sched, RAS merges
Diffstat (limited to 'config-generic')
-rw-r--r-- | config-generic | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/config-generic b/config-generic index 2ffca51e1..272fa4a75 100644 --- a/config-generic +++ b/config-generic @@ -2810,6 +2810,7 @@ CONFIG_SENSORS_LTC4260=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_MAX6697=m +CONFIG_SENSORS_MAX31722=m CONFIG_SENSORS_MCP3021=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT6683=m @@ -5183,6 +5184,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y @@ -5351,6 +5353,8 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_TRANSIENT=m CONFIG_LEDS_TRIGGER_CAMERA=m +CONFIG_LEDS_TRIGGER_MTD=y +CONFIG_LEDS_TRIGGER_PANIC=y CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LM3530=m @@ -5893,6 +5897,7 @@ CONFIG_POWERCAP=y # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set # CONFIG_DEVFREQ_GOV_USERSPACE is not set +# CONFIG_DEVFREQ_GOV_PASSIVE is not set # CONFIG_CPUFREQ_DT is not set @@ -5932,3 +5937,10 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y # CONFIG_AHCI_QORIQ is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_CLK_QORIQ is not set + +# CONFIG_PWRSEQ_EMMC is not set +# CONFIG_PWRSEQ_SIMPLE is not set + +# The kernel code has a nice comment +# WARNING: Do not even assume this interface is staying stable! +# CONFIG_MCE_AMD_INJ is not set |