summaryrefslogtreecommitdiffstats
path: root/config-x86_64-generic
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2011-07-07 15:44:13 -0400
committerDave Jones <davej@redhat.com>2011-07-07 15:44:13 -0400
commit75d6a46098fa643e6cceddd2763f840c258b1055 (patch)
treedc5dc40a6072c2308329b93b4d582b35048cbefa /config-x86_64-generic
parentc2cf2cf9902c9990cde5112782bb98bbafee420b (diff)
downloadkernel-75d6a46098fa643e6cceddd2763f840c258b1055.tar.gz
kernel-75d6a46098fa643e6cceddd2763f840c258b1055.tar.xz
kernel-75d6a46098fa643e6cceddd2763f840c258b1055.zip
Centralise CPU_FREQ options into config-generic.
Switch to using ondemand by default. (rhbz 713572)
Diffstat (limited to 'config-x86_64-generic')
-rw-r--r--config-x86_64-generic16
1 files changed, 2 insertions, 14 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic
index a633484ed..7700e4e9d 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -56,21 +56,9 @@ CONFIG_SUSPEND=y
CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION=""
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-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_CONSERVATIVE=m
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_DEBUG=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_X86_PCC_CPUFREQ=y
+CONFIG_X86_ACPI_CPUFREQ=y
CONFIG_ACPI=y
CONFIG_ACPI_AC=y