ChangeSet 1.2181.17.4, 2005/04/03 20:16:16+02:00, [EMAIL PROTECTED]
kconfig: complete cpufreq Kconfig cleanup
This completes the Kconfig cleanup for all other archs.
CPU_FREQ_TABLE was moved to drivers/cpufreq/Kconfig and is selected as
needed.
Signed-off-by: Roman Zippel <[EMAIL PROTECTED]>
Signed-off-by: Sam Ravnborg <[EMAIL PROTECTED]>
ppc/Kconfig | 6 +-----
sh/Kconfig | 11 +----------
sparc64/Kconfig | 16 ++++------------
x86_64/kernel/cpufreq/Kconfig | 28 ++++++++++------------------
4 files changed, 16 insertions(+), 45 deletions(-)
diff -Nru a/arch/ppc/Kconfig b/arch/ppc/Kconfig
--- a/arch/ppc/Kconfig 2005-04-03 21:25:49 -07:00
+++ b/arch/ppc/Kconfig 2005-04-03 21:25:49 -07:00
@@ -203,15 +203,11 @@
config CPU_FREQ_PMAC
bool "Support for Apple PowerBooks"
depends on CPU_FREQ && ADB_PMU
+ select CPU_FREQ_TABLE
help
This adds support for frequency switching on Apple PowerBooks,
this currently includes some models of iBook & Titanium
PowerBook.
-
-config CPU_FREQ_TABLE
- tristate
- depends on CPU_FREQ_PMAC
- default y
config PPC601_SYNC_FIX
bool "Workarounds for PPC601 bugs"
diff -Nru a/arch/sh/Kconfig b/arch/sh/Kconfig
--- a/arch/sh/Kconfig 2005-04-03 21:25:49 -07:00
+++ b/arch/sh/Kconfig 2005-04-03 21:25:49 -07:00
@@ -659,19 +659,10 @@
source "drivers/cpufreq/Kconfig"
-config CPU_FREQ_TABLE
- tristate "CPU frequency table helpers"
- depends on CPU_FREQ
- default y
- help
- Many cpufreq drivers use these helpers, so only say N here if
- the cpufreq driver of your choice doesn't need these helpers.
-
- If unsure, say Y.
-
config SH_CPU_FREQ
tristate "SuperH CPU Frequency driver"
depends on CPU_FREQ
+ select CPU_FREQ_TABLE
help
This adds the cpufreq driver for SuperH. At present, only
the SH-4 is supported.
diff -Nru a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
--- a/arch/sparc64/Kconfig 2005-04-03 21:25:49 -07:00
+++ b/arch/sparc64/Kconfig 2005-04-03 21:25:49 -07:00
@@ -136,19 +136,10 @@
source "drivers/cpufreq/Kconfig"
-config CPU_FREQ_TABLE
- tristate "CPU frequency table helpers"
- depends on CPU_FREQ
- default y
- help
- Many CPUFreq drivers use these helpers, so only say N here if
- the CPUFreq driver of your choice doesn't need these helpers.
-
- If in doubt, say Y.
-
config US3_FREQ
tristate "UltraSPARC-III CPU Frequency driver"
- depends on CPU_FREQ_TABLE
+ depends on CPU_FREQ
+ select CPU_FREQ_TABLE
help
This adds the CPUFreq driver for UltraSPARC-III processors.
@@ -158,7 +149,8 @@
config US2E_FREQ
tristate "UltraSPARC-IIe CPU Frequency driver"
- depends on CPU_FREQ_TABLE
+ depends on CPU_FREQ
+ select CPU_FREQ_TABLE
help
This adds the CPUFreq driver for UltraSPARC-IIe processors.
diff -Nru a/arch/x86_64/kernel/cpufreq/Kconfig
b/arch/x86_64/kernel/cpufreq/Kconfig
--- a/arch/x86_64/kernel/cpufreq/Kconfig 2005-04-03 21:25:49 -07:00
+++ b/arch/x86_64/kernel/cpufreq/Kconfig 2005-04-03 21:25:49 -07:00
@@ -6,22 +6,13 @@
source "drivers/cpufreq/Kconfig"
-config CPU_FREQ_TABLE
- tristate "CPU frequency table helpers"
- depends on CPU_FREQ
- default y
- help
- Many CPUFreq drivers use these helpers, so only say N here if
- the CPUFreq driver of your choice doesn't need these helpers.
-
- If in doubt, say Y.
+if CPU_FREQ
comment "CPUFreq processor drivers"
- depends on CPU_FREQ
config X86_POWERNOW_K8
tristate "AMD Opteron/Athlon64 PowerNow!"
- depends on CPU_FREQ_TABLE
+ select CPU_FREQ_TABLE
help
This adds the CPUFreq driver for mobile AMD Opteron/Athlon64
processors.
@@ -31,12 +22,14 @@
config X86_POWERNOW_K8_ACPI
bool
- depends on ((X86_POWERNOW_K8 = "m" && ACPI_PROCESSOR) ||
(X86_POWERNOW_K8 = "y" && ACPI_PROCESSOR = "y"))
+ depends on X86_POWERNOW_K8 && ACPI_PROCESSOR
+ depends on !(X86_POWERNOW_K8 = y && ACPI_PROCESSOR = m)
default y
config X86_SPEEDSTEP_CENTRINO
tristate "Intel Enhanced SpeedStep"
- depends on CPU_FREQ_TABLE && ACPI_PROCESSOR
+ select CPU_FREQ_TABLE
+ depends on ACPI_PROCESSOR
help
This adds the CPUFreq driver for Enhanced SpeedStep enabled
mobile CPUs. This means Intel Pentium M (Centrino) CPUs
@@ -53,7 +46,7 @@
config X86_ACPI_CPUFREQ
tristate "ACPI Processor P-States driver"
- depends on CPU_FREQ_TABLE && ACPI_PROCESSOR
+ depends on ACPI_PROCESSOR
help
This driver adds a CPUFreq driver which utilizes the ACPI
Processor Performance States.
@@ -63,7 +56,6 @@
If in doubt, say N.
comment "shared options"
- depends on CPU_FREQ
config X86_ACPI_CPUFREQ_PROC_INTF
bool "/proc/acpi/processor/../performance interface (deprecated)"
@@ -78,7 +70,7 @@
config X86_P4_CLOCKMOD
tristate "Intel Pentium 4 clock modulation"
- depends on CPU_FREQ_TABLE && EMBEDDED
+ depends on EMBEDDED
help
This adds the clock modulation driver for Intel Pentium 4 / XEON
processors. When enabled it will lower CPU temperature by skipping
@@ -96,9 +88,9 @@
config X86_SPEEDSTEP_LIB
tristate
- depends on (X86_P4_CLOCKMOD)
- default (X86_P4_CLOCKMOD)
+ default X86_P4_CLOCKMOD
+endif
endmenu
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
