diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
| commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
| tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /Documentation/power/basic-pm-debugging.txt | |
| parent | 1408b15b98635a13bad2e2a50b3c2ae2ccdf625b (diff) | |
| parent | e9203c988234aa512bd45ca32b52e21c7bbfc414 (diff) | |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'Documentation/power/basic-pm-debugging.txt')
| -rw-r--r-- | Documentation/power/basic-pm-debugging.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/power/basic-pm-debugging.txt b/Documentation/power/basic-pm-debugging.txt index 1555001bc733..ddd78172ef73 100644 --- a/Documentation/power/basic-pm-debugging.txt +++ b/Documentation/power/basic-pm-debugging.txt | |||
| @@ -179,8 +179,7 @@ use the PM_TRACE mechanism documented in Documentation/s2ram.txt . | |||
| 179 | 179 | ||
| 180 | To verify that the STR works, it is generally more convenient to use the s2ram | 180 | To verify that the STR works, it is generally more convenient to use the s2ram |
| 181 | tool available from http://suspend.sf.net and documented at | 181 | tool available from http://suspend.sf.net and documented at |
| 182 | http://en.opensuse.org/s2ram . However, before doing that it is recommended to | 182 | http://en.opensuse.org/SDB:Suspend_to_RAM. |
| 183 | carry out STR testing using the facility described in section 1. | ||
| 184 | 183 | ||
| 185 | Namely, after writing "freezer", "devices", "platform", "processors", or "core" | 184 | Namely, after writing "freezer", "devices", "platform", "processors", or "core" |
| 186 | into /sys/power/pm_test (available if the kernel is compiled with | 185 | into /sys/power/pm_test (available if the kernel is compiled with |