aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-07-08 17:39:14 -0400
committerDave Jones <davej@redhat.com>2007-07-13 01:29:51 -0400
commit68485695e5a84399da7b48b208ac42623fe22963 (patch)
treed76718f250443ba51eb4c7b2d43dcde44468f595 /arch/x86_64
parent905497c4b2e6715eebde97cbcb313354e14c2489 (diff)
[CPUFREQ] the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI
This patch contains the overdue removal of X86_SPEEDSTEP_CENTRINO_ACPI. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/kernel/cpufreq/Kconfig6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86_64/kernel/cpufreq/Kconfig b/arch/x86_64/kernel/cpufreq/Kconfig
index c0749d2479f5..a3fd51926cbd 100644
--- a/arch/x86_64/kernel/cpufreq/Kconfig
+++ b/arch/x86_64/kernel/cpufreq/Kconfig
@@ -48,10 +48,6 @@ config X86_SPEEDSTEP_CENTRINO
48 48
49 If in doubt, say N. 49 If in doubt, say N.
50 50
51config X86_SPEEDSTEP_CENTRINO_ACPI
52 bool
53 depends on X86_SPEEDSTEP_CENTRINO
54
55config X86_ACPI_CPUFREQ 51config X86_ACPI_CPUFREQ
56 tristate "ACPI Processor P-States driver" 52 tristate "ACPI Processor P-States driver"
57 select CPU_FREQ_TABLE 53 select CPU_FREQ_TABLE
@@ -73,7 +69,7 @@ comment "shared options"
73config X86_ACPI_CPUFREQ_PROC_INTF 69config X86_ACPI_CPUFREQ_PROC_INTF
74 bool "/proc/acpi/processor/../performance interface (deprecated)" 70 bool "/proc/acpi/processor/../performance interface (deprecated)"
75 depends on PROC_FS 71 depends on PROC_FS
76 depends on X86_ACPI_CPUFREQ || X86_SPEEDSTEP_CENTRINO_ACPI || X86_POWERNOW_K8_ACPI 72 depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K8_ACPI
77 help 73 help
78 This enables the deprecated /proc/acpi/processor/../performance 74 This enables the deprecated /proc/acpi/processor/../performance
79 interface. While it is helpful for debugging, the generic, 75 interface. While it is helpful for debugging, the generic,