diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-01-04 17:31:08 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-01-04 17:31:08 -0500 |
| commit | 4f125010d2d02c481a0fdf5aee23a9f937bc5de1 (patch) | |
| tree | dcdcd2ba1d0bb980b57ced9a1b2b5b17c84c8f57 /Documentation/power/runtime_pm.txt | |
| parent | 204663c48711ddceee09df46269cd34d49d1f7be (diff) | |
| parent | 989d873fc5b6a96695b97738dea8d9f02a60f8ab (diff) | |
Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next
Diffstat (limited to 'Documentation/power/runtime_pm.txt')
| -rw-r--r-- | Documentation/power/runtime_pm.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt index 489e9bacd165..41cc7b30d7dd 100644 --- a/Documentation/power/runtime_pm.txt +++ b/Documentation/power/runtime_pm.txt | |||
| @@ -379,8 +379,8 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: | |||
| 379 | zero) | 379 | zero) |
| 380 | 380 | ||
| 381 | bool pm_runtime_suspended(struct device *dev); | 381 | bool pm_runtime_suspended(struct device *dev); |
| 382 | - return true if the device's runtime PM status is 'suspended', or false | 382 | - return true if the device's runtime PM status is 'suspended' and its |
| 383 | otherwise | 383 | 'power.disable_depth' field is equal to zero, or false otherwise |
| 384 | 384 | ||
| 385 | void pm_runtime_allow(struct device *dev); | 385 | void pm_runtime_allow(struct device *dev); |
| 386 | - set the power.runtime_auto flag for the device and decrease its usage | 386 | - set the power.runtime_auto flag for the device and decrease its usage |