Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[~andy/linux] / drivers / cpufreq / Kconfig

diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index 5f076aef74fa96d95959f84931d6ac42974d8b01..ca8ee8093d6c604266c13b94a0949f4ca6c0abba 100644 (file)
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -71,7 +71,7 @@ config CPU_FREQ_DEFAULT_GOV_PERFORMANCE
 
 config CPU_FREQ_DEFAULT_GOV_POWERSAVE
        bool "powersave"
 
 config CPU_FREQ_DEFAULT_GOV_POWERSAVE
        bool "powersave"

-       depends on EMBEDDED
+       depends on EXPERT

        select CPU_FREQ_GOV_POWERSAVE
        help
          Use the CPUFreq governor 'powersave' as default. This sets
        select CPU_FREQ_GOV_POWERSAVE
        help
          Use the CPUFreq governor 'powersave' as default. This sets


@@ -83,7 +83,7 @@ config CPU_FREQ_DEFAULT_GOV_USERSPACE
        select CPU_FREQ_GOV_USERSPACE
        help
          Use the CPUFreq governor 'userspace' as default. This allows
        select CPU_FREQ_GOV_USERSPACE
        help
          Use the CPUFreq governor 'userspace' as default. This allows

-         you to set the CPU frequency manually or when an userspace 
+         you to set the CPU frequency manually or when a userspace 

          program shall be able to set the CPU dynamically without having
          to enable the userspace governor manually.
 
          program shall be able to set the CPU dynamically without having
          to enable the userspace governor manually.
 


@@ -138,7 +138,7 @@ config CPU_FREQ_GOV_USERSPACE
        tristate "'userspace' governor for userspace frequency scaling"
        help
          Enable this cpufreq governor when you either want to set the
        tristate "'userspace' governor for userspace frequency scaling"
        help
          Enable this cpufreq governor when you either want to set the

-         CPU frequency manually or when an userspace program shall
+         CPU frequency manually or when a userspace program shall

          be able to set the CPU dynamically, like on LART 
          <http://www.lartmaker.nl/>.
 
          be able to set the CPU dynamically, like on LART 
          <http://www.lartmaker.nl/>.