PPC32: Fix up the CPU frequency scaling questions in arch/ppc/Kconfig.

This is from Ben Herrenschmidt's tree.

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 1e950df48163cd2f7d64b8013dc7b656d0c32768..2bee0eaa2cb63d41939fc594a8b9dd83dd9803ed 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -164,36 +164,7 @@ config CPU_FREQ
 
          If in doubt, say N.
 
-config CPU_FREQ_TABLE
-       bool
-       depends on CPU_FREQ
-       default y
-
-config CPU_FREQ_PROC_INTF
-       bool "/proc/cpufreq interface (DEPRECATED)"
-       depends on CPU_FREQ && PROC_FS
-       help
-         This enables the /proc/cpufreq interface for controlling
-         CPUFreq. Please note that it is recommended to use the sysfs
-         interface instead (which is built automatically).
-       
-         For details, take a look at linux/Documentation/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 a sysfs interface 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.
+source "drivers/cpufreq/Kconfig"
 
 config CPU_FREQ_PMAC
        bool "Support for Apple PowerBooks"
@@ -203,6 +174,11 @@ config CPU_FREQ_PMAC
          this currently includes some models of iBook & Titanium
          PowerBook.
 
+config CPU_FREQ_TABLE
+       bool
+       depends on CPU_FREQ_PMAC
+       default y
+
 config PPC601_SYNC_FIX
        bool "Workarounds for PPC601 bugs"
        depends on 6xx