diff options
| author | David S. Miller <davem@davemloft.net> | 2011-09-16 01:09:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-16 01:09:02 -0400 |
| commit | 52b9aca7ae8726d1fb41b97dd1d243d107fef11b (patch) | |
| tree | 7acee111840bd25183513e9bde08e939ffd57be8 /Documentation | |
| parent | 7756332f5b64c9c1535712b9679792e8bd4f0019 (diff) | |
| parent | e2faeec2de9e2c73958e6ea6065dde1e8cd6f3a2 (diff) | |
| download | op-kernel-dev-52b9aca7ae8726d1fb41b97dd1d243d107fef11b.zip op-kernel-dev-52b9aca7ae8726d1fb41b97dd1d243d107fef11b.tar.gz | |
Merge branch 'master' of ../netdev/
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/power/runtime_pm.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt index 4ce5450..6066e3a 100644 --- a/Documentation/power/runtime_pm.txt +++ b/Documentation/power/runtime_pm.txt @@ -431,8 +431,7 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: void pm_runtime_irq_safe(struct device *dev); - set the power.irq_safe flag for the device, causing the runtime-PM - suspend and resume callbacks (but not the idle callback) to be invoked - with interrupts disabled + callbacks to be invoked with interrupts off void pm_runtime_mark_last_busy(struct device *dev); - set the power.last_busy field to the current time |
