From 0bb82354d7a491a5796d3d0f672be15929cf72ba Mon Sep 17 00:00:00 2001 From: "Paolo \\'Blaisorblade\\' Giarrusso" Date: Fri, 18 Mar 2005 00:12:55 +0100 Subject: kconfig: Fix kconfig docs typo: integer -> int Trivial correction: the type of numbers for Kconfig is not integer but int (I just verified because I followed the wrong docs and got a error, I looked elsewhere and they are using int, and int works for me). Please apply. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Sam Ravnborg --- Documentation/kbuild/kconfig-language.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/kbuild/kconfig-language.txt b/Documentation/kbuild/kconfig-language.txt index da51c0e7c19b9..ca1967f364239 100644 --- a/Documentation/kbuild/kconfig-language.txt +++ b/Documentation/kbuild/kconfig-language.txt @@ -48,7 +48,7 @@ Menu attributes A menu entry can have a number of attributes. Not all of them are applicable everywhere (see syntax). -- type definition: "bool"/"tristate"/"string"/"hex"/"integer" +- type definition: "bool"/"tristate"/"string"/"hex"/"int" Every config option must have a type. There are only two basic types: tristate and string, the other types are based on these two. The type definition optionally accepts an input prompt, so these two examples @@ -100,7 +100,7 @@ applicable everywhere (see syntax). symbols. - numerical ranges: "range" ["if" ] - This allows to limit the range of possible input values for integer + This allows to limit the range of possible input values for int and hex symbols. The user can only input a value which is larger than or equal to the first symbol and smaller than or equal to the second symbol. -- cgit 1.2.3-korg From 1d7c38220e5f4cdd577082409835a350c2e82638 Mon Sep 17 00:00:00 2001 From: Roman Zippel Date: Mon, 4 Apr 2005 00:16:16 +0200 Subject: 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 Signed-off-by: Sam Ravnborg --- arch/ppc/Kconfig | 6 +----- arch/sh/Kconfig | 11 +---------- arch/sparc64/Kconfig | 16 ++++------------ arch/x86_64/kernel/cpufreq/Kconfig | 28 ++++++++++------------------ 4 files changed, 16 insertions(+), 45 deletions(-) diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 7ae2554421d31..8b233b8b6e1aa 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig @@ -203,16 +203,12 @@ source "drivers/cpufreq/Kconfig" 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" depends on 6xx && (PPC_PREP || PPC_PMAC) diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 5effcd4d1cc19..722ea1d63c943 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -659,19 +659,10 @@ menu "CPU Frequency scaling" 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 --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index b31687f3e7214..6a3b6c547786d 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig @@ -136,19 +136,10 @@ config NR_CPUS 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 US3_FREQ 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 --git a/arch/x86_64/kernel/cpufreq/Kconfig b/arch/x86_64/kernel/cpufreq/Kconfig index acaf62aa5e15c..81f1562e53938 100644 --- a/arch/x86_64/kernel/cpufreq/Kconfig +++ b/arch/x86_64/kernel/cpufreq/Kconfig @@ -6,22 +6,13 @@ menu "CPU Frequency scaling" 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 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_SPEEDSTEP_CENTRINO_ACPI 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 @@ config X86_ACPI_CPUFREQ 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_ACPI_CPUFREQ_PROC_INTF 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_P4_CLOCKMOD config X86_SPEEDSTEP_LIB tristate - depends on (X86_P4_CLOCKMOD) - default (X86_P4_CLOCKMOD) + default X86_P4_CLOCKMOD +endif endmenu -- cgit 1.2.3-korg