diff options
| author | Colin Cross <ccross@android.com> | 2011-01-07 17:20:53 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-01-07 17:20:53 -0800 |
| commit | 351516118103c6c7bb5321aa9d5866eb3dc0d5ca (patch) | |
| tree | bf8ecc55d77847ec8299bcf964352bef38121cc5 /Documentation/power | |
| parent | c37bff78783d40d6e604129135c207e279de902f (diff) | |
| parent | bd842b53fada517017d192c8a12fc9a38e6250e1 (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
arch/arm/mm/cache-v6.S
Change-Id: I1a2063218dd705a762a40f4a9dfe504ce1a1d491
Diffstat (limited to 'Documentation/power')
| -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 55b859b3bc72..506d9d916e41 100644 --- a/Documentation/power/runtime_pm.txt +++ b/Documentation/power/runtime_pm.txt @@ -336,8 +336,8 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: zero) bool pm_runtime_suspended(struct device *dev); - - return true if the device's runtime PM status is 'suspended', or false - otherwise + - return true if the device's runtime PM status is 'suspended' and its + 'power.disable_depth' field is equal to zero, or false otherwise void pm_runtime_allow(struct device *dev); - set the power.runtime_auto flag for the device and decrease its usage |