diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:31:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:31:52 -0500 |
| commit | 57c44c5f6fb0a8002feb258c1af58e1a744b1fcb (patch) | |
| tree | 978bd46ca765a88e9c101cb705bbb0bf46015643 /drivers/cpufreq/Kconfig | |
| parent | 76052749143d03006271cc0ce8205ad756917062 (diff) | |
| parent | 5a9e67b1a19e08a82387709f325d26e07b891d27 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits)
trivial: chack -> check typo fix in main Makefile
trivial: Add a space (and a comma) to a printk in 8250 driver
trivial: Fix misspelling of "firmware" in docs for ncr53c8xx/sym53c8xx
trivial: Fix misspelling of "firmware" in powerpc Makefile
trivial: Fix misspelling of "firmware" in usb.c
trivial: Fix misspelling of "firmware" in qla1280.c
trivial: Fix misspelling of "firmware" in a100u2w.c
trivial: Fix misspelling of "firmware" in megaraid.c
trivial: Fix misspelling of "firmware" in ql4_mbx.c
trivial: Fix misspelling of "firmware" in acpi_memhotplug.c
trivial: Fix misspelling of "firmware" in ipw2100.c
trivial: Fix misspelling of "firmware" in atmel.c
trivial: Fix misspelled firmware in Kconfig
trivial: fix an -> a typos in documentation and comments
trivial: fix then -> than typos in comments and documentation
trivial: update Jesper Juhl CREDITS entry with new email
trivial: fix singal -> signal typo
trivial: Fix incorrect use of "loose" in event.c
trivial: printk: fix indentation of new_text_line declaration
trivial: rtc-stk17ta8: fix sparse warning
...
Diffstat (limited to 'drivers/cpufreq/Kconfig')
| -rw-r--r-- | drivers/cpufreq/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index 5f076aef74fa..a8c8d9c19d74 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig | |||
| @@ -83,7 +83,7 @@ config CPU_FREQ_DEFAULT_GOV_USERSPACE | |||
| 83 | select CPU_FREQ_GOV_USERSPACE | 83 | select CPU_FREQ_GOV_USERSPACE |
| 84 | help | 84 | help |
| 85 | Use the CPUFreq governor 'userspace' as default. This allows | 85 | Use the CPUFreq governor 'userspace' as default. This allows |
| 86 | you to set the CPU frequency manually or when an userspace | 86 | you to set the CPU frequency manually or when a userspace |
| 87 | program shall be able to set the CPU dynamically without having | 87 | program shall be able to set the CPU dynamically without having |
| 88 | to enable the userspace governor manually. | 88 | to enable the userspace governor manually. |
| 89 | 89 | ||
| @@ -138,7 +138,7 @@ config CPU_FREQ_GOV_USERSPACE | |||
| 138 | tristate "'userspace' governor for userspace frequency scaling" | 138 | tristate "'userspace' governor for userspace frequency scaling" |
| 139 | help | 139 | help |
| 140 | Enable this cpufreq governor when you either want to set the | 140 | Enable this cpufreq governor when you either want to set the |
| 141 | CPU frequency manually or when an userspace program shall | 141 | CPU frequency manually or when a userspace program shall |
| 142 | be able to set the CPU dynamically, like on LART | 142 | be able to set the CPU dynamically, like on LART |
| 143 | <http://www.lartmaker.nl/>. | 143 | <http://www.lartmaker.nl/>. |
| 144 | 144 | ||