[PATCH] cpufreq: move x86 configuration to "Power Management"

This patch moves the Kconfig entries for CPUfreq from "Processor type and
features" to "Power management options".

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index cddcd0764ab78d7d61d04e30f297cd768024baec..b72e6ba66ef8d57838858c6442a8d91b9ba0105a 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -465,104 +465,6 @@ config X86_MCE_P4THERMAL
          Enabling this feature will cause a message to be printed when the P4
          enters thermal throttling.
 
-config CPU_FREQ
-       bool "CPU Frequency scaling"
-       help
-         Clock scaling allows you to change the clock speed of CPUs on the
-         fly. This is a nice method to save battery power on notebooks,
-         because the lower the clock speed, the less power the CPU consumes.
-
-         For more information, take a look at linux/Documentation/cpufreq or
-         at <http://www.brodo.de/cpufreq/>
-
-         If in doubt, say N.
-
-config CPU_FREQ_24_API
-       bool "/proc/sys/cpu/ interface (2.4. / OLD)"
-       depends on CPU_FREQ
-       help
-         This enables the /proc/sys/cpu/ sysctl interface for controlling
-         CPUFreq, as known from the 2.4.-kernel patches for CPUFreq. 2.5
-         uses /proc/cpufreq instead. Please note that some drivers do not 
-         work well with the 2.4. /proc/sys/cpu sysctl interface, so if in
-         doubt, say N here.
-
-         For details, take a look at linux/Documentation/cpufreq. 
-
-         If in doubt, say N.
-
-config X86_POWERNOW_K6
-       tristate "AMD Mobile K6-2/K6-3 PowerNow!"
-       depends on CPU_FREQ
-       help
-         This adds the CPUFreq driver for mobile AMD K6-2+ and mobile
-         AMD K6-3+ processors.
-
-         For details, take a look at linux/Documentation/cpufreq. 
-
-         If in doubt, say N.
-
-config ELAN_CPUFREQ
-       tristate "AMD Elan"
-       depends on CPU_FREQ && MELAN
-       ---help---
-         This adds the CPUFreq driver for AMD Elan SC400 and SC410
-         processors.
-
-         You need to specify the processor maximum speed as boot
-         parameter: elanfreq=maxspeed (in kHz) or as module
-         parameter "max_freq".
-
-         For details, take a look at linux/Documentation/cpufreq. 
-
-         If in doubt, say N.
-
-config X86_LONGHAUL
-       tristate "VIA Cyrix III Longhaul"
-       depends on CPU_FREQ
-       help
-         This adds the CPUFreq driver for VIA Samuel/CyrixIII, 
-         VIA Cyrix Samuel/C3, VIA Cyrix Ezra and VIA Cyrix Ezra-T 
-         processors.
-
-         For details, take a look at linux/Documentation/cpufreq. 
-
-         If in doubt, say N.
-
-config X86_SPEEDSTEP
-       tristate "Intel Speedstep"
-       depends on CPU_FREQ
-       help
-         This adds the CPUFreq driver for certain mobile Intel Pentium III
-         (Coppermine), all mobile Intel Pentium III-M (Tulatin) and all
-         mobile Intel Pentium 4 P4-Ms.
-
-         For details, take a look at linux/Documentation/cpufreq. 
-
-         If in doubt, say N.
-
-config X86_P4_CLOCKMOD
-       tristate "Intel Pentium 4 clock modulation"
-       depends on CPU_FREQ
-       help
-         This adds the CPUFreq driver for Intel Pentium 4 / XEON
-         processors.
-
-         For details, take a look at linux/Documentation/cpufreq. 
-
-         If in doubt, say N.
-
-config X86_LONGRUN
-       tristate "Transmeta LongRun"
-       depends on CPU_FREQ
-       help
-         This adds the CPUFreq driver for Transmeta Crusoe processors which
-         support LongRun.
-
-         For details, take a look at linux/Documentation/cpufreq. 
-
-         If in doubt, say N.
-
 config TOSHIBA
        tristate "Toshiba Laptop support"
        ---help---
@@ -985,6 +887,104 @@ config APM_REAL_MODE_POWER_OFF
          a work-around for a number of buggy BIOSes. Switch this option on if
          your computer crashes instead of powering off properly.
 
+config CPU_FREQ
+       bool "CPU Frequency scaling"
+       help
+         Clock scaling allows you to change the clock speed of CPUs on the
+         fly. This is a nice method to save battery power on notebooks,
+         because the lower the clock speed, the less power the CPU consumes.
+
+         For more information, take a look at linux/Documentation/cpufreq or
+         at <http://www.brodo.de/cpufreq/>
+
+         If in doubt, say N.
+
+config CPU_FREQ_24_API
+       bool "/proc/sys/cpu/ interface (2.4. / OLD)"
+       depends on CPU_FREQ
+       help
+         This enables the /proc/sys/cpu/ sysctl interface for controlling
+         CPUFreq, as known from the 2.4.-kernel patches for CPUFreq. 2.5
+         uses /proc/cpufreq instead. Please note that some drivers do not 
+         work well with the 2.4. /proc/sys/cpu sysctl interface, so if in
+         doubt, say N here.
+
+         For details, take a look at linux/Documentation/cpufreq. 
+
+         If in doubt, say N.
+
+config X86_POWERNOW_K6
+       tristate "AMD Mobile K6-2/K6-3 PowerNow!"
+       depends on CPU_FREQ
+       help
+         This adds the CPUFreq driver for mobile AMD K6-2+ and mobile
+         AMD K6-3+ processors.
+
+         For details, take a look at linux/Documentation/cpufreq. 
+
+         If in doubt, say N.
+
+config ELAN_CPUFREQ
+       tristate "AMD Elan"
+       depends on CPU_FREQ && MELAN
+       ---help---
+         This adds the CPUFreq driver for AMD Elan SC400 and SC410
+         processors.
+
+         You need to specify the processor maximum speed as boot
+         parameter: elanfreq=maxspeed (in kHz) or as module
+         parameter "max_freq".
+
+         For details, take a look at linux/Documentation/cpufreq. 
+
+         If in doubt, say N.
+
+config X86_LONGHAUL
+       tristate "VIA Cyrix III Longhaul"
+       depends on CPU_FREQ
+       help
+         This adds the CPUFreq driver for VIA Samuel/CyrixIII, 
+         VIA Cyrix Samuel/C3, VIA Cyrix Ezra and VIA Cyrix Ezra-T 
+         processors.
+
+         For details, take a look at linux/Documentation/cpufreq. 
+
+         If in doubt, say N.
+
+config X86_SPEEDSTEP
+       tristate "Intel Speedstep"
+       depends on CPU_FREQ
+       help
+         This adds the CPUFreq driver for certain mobile Intel Pentium III
+         (Coppermine), all mobile Intel Pentium III-M (Tulatin) and all
+         mobile Intel Pentium 4 P4-Ms.
+
+         For details, take a look at linux/Documentation/cpufreq. 
+
+         If in doubt, say N.
+
+config X86_P4_CLOCKMOD
+       tristate "Intel Pentium 4 clock modulation"
+       depends on CPU_FREQ
+       help
+         This adds the CPUFreq driver for Intel Pentium 4 / XEON
+         processors.
+
+         For details, take a look at linux/Documentation/cpufreq. 
+
+         If in doubt, say N.
+
+config X86_LONGRUN
+       tristate "Transmeta LongRun"
+       depends on CPU_FREQ
+       help
+         This adds the CPUFreq driver for Transmeta Crusoe processors which
+         support LongRun.
+
+         For details, take a look at linux/Documentation/cpufreq. 
+
+         If in doubt, say N.
+
 endmenu