summaryrefslogtreecommitdiffstats
path: root/config-x86-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-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-generic')
-rw-r--r--config-x86-generic24
1 files changed, 4 insertions, 20 deletions
diff --git a/config-x86-generic b/config-x86-generic
index 437eed906..a5cf0f07c 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -158,34 +158,18 @@ CONFIG_ACPI_APEI_GHES=m
CONFIG_ACPI_IPMI=m
CONFIG_ACPI_CUSTOM_METHOD=m
-#
-# CPUFreq processor drivers
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEBUG=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_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=y
+CONFIG_X86_PCC_CPUFREQ=y
# CONFIG_X86_POWERNOW_K6 is not set
CONFIG_X86_POWERNOW_K7=y
-CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_POWERNOW_K8=y
# CONFIG_X86_GX_SUSPMOD is not set
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
CONFIG_X86_SPEEDSTEP_ICH=y
CONFIG_X86_SPEEDSTEP_SMI=y
CONFIG_X86_SPEEDSTEP_LIB=y
# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
-CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_P4_CLOCKMOD=y
CONFIG_X86_LONGRUN=y
# CONFIG_X86_LONGHAUL is not set
# CONFIG_X86_CPUFREQ_NFORCE2 is not set