diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 19:47:42 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 19:47:42 -0300 |
commit | c4cc142235d7d77327c2a53d9efb2750b1ec80bf (patch) | |
tree | 41446fa0833a3783d24b6bd12c64336f845e6032 /libre/linux-libre-lts/config.x86_64 | |
parent | 5ddafb1e55d18275d3f16e9faa3e9da788b54389 (diff) | |
parent | b1b9debcc7f6756d83dbac37806021de007cf083 (diff) |
Merge branch 'master' of ssh://gparabola/abslibre
Conflicts:
libre/linux-libre/PKGBUILD
Diffstat (limited to 'libre/linux-libre-lts/config.x86_64')
-rw-r--r-- | libre/linux-libre-lts/config.x86_64 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index a8c0e10c0..6ec74a8a4 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -494,17 +494,17 @@ CONFIG_SFI=y # CPU Frequency scaling # CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=m +CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # @@ -5197,7 +5197,7 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_SCHED_DEBUG=y -# CONFIG_SCHEDSTATS is not set +CONFIG_SCHEDSTATS=y CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set |