diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /Documentation/cpu-freq | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'Documentation/cpu-freq')
| -rw-r--r-- | Documentation/cpu-freq/core.txt | 2 | ||||
| -rw-r--r-- | Documentation/cpu-freq/cpufreq-nforce2.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/cpu-freq/core.txt b/Documentation/cpu-freq/core.txt index 29b3f9ffc66c..ce0666e51036 100644 --- a/Documentation/cpu-freq/core.txt +++ b/Documentation/cpu-freq/core.txt | |||
| @@ -24,7 +24,7 @@ Contents: | |||
| 24 | 1. General Information | 24 | 1. General Information |
| 25 | ======================= | 25 | ======================= |
| 26 | 26 | ||
| 27 | The CPUFreq core code is located in linux/kernel/cpufreq.c. This | 27 | The CPUFreq core code is located in drivers/cpufreq/cpufreq.c. This |
| 28 | cpufreq code offers a standardized interface for the CPUFreq | 28 | cpufreq code offers a standardized interface for the CPUFreq |
| 29 | architecture drivers (those pieces of code that do actual | 29 | architecture drivers (those pieces of code that do actual |
| 30 | frequency transitions), as well as to "notifiers". These are device | 30 | frequency transitions), as well as to "notifiers". These are device |
diff --git a/Documentation/cpu-freq/cpufreq-nforce2.txt b/Documentation/cpu-freq/cpufreq-nforce2.txt index 9188337d8f6b..babce1315026 100644 --- a/Documentation/cpu-freq/cpufreq-nforce2.txt +++ b/Documentation/cpu-freq/cpufreq-nforce2.txt | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | 1 | ||
| 2 | The cpufreq-nforce2 driver changes the FSB on nVidia nForce2 plattforms. | 2 | The cpufreq-nforce2 driver changes the FSB on nVidia nForce2 platforms. |
| 3 | 3 | ||
| 4 | This works better than on other plattforms, because the FSB of the CPU | 4 | This works better than on other platforms, because the FSB of the CPU |
| 5 | can be controlled independently from the PCI/AGP clock. | 5 | can be controlled independently from the PCI/AGP clock. |
| 6 | 6 | ||
| 7 | The module has two options: | 7 | The module has two options: |