diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/base/power/runtime.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/base/power/runtime.c')
| -rw-r--r-- | drivers/base/power/runtime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 54597c859ecb..3172c60d23a9 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c | |||
| @@ -443,7 +443,7 @@ static int rpm_suspend(struct device *dev, int rpmflags) | |||
| 443 | * | 443 | * |
| 444 | * Check if the device's run-time PM status allows it to be resumed. Cancel | 444 | * Check if the device's run-time PM status allows it to be resumed. Cancel |
| 445 | * any scheduled or pending requests. If another resume has been started | 445 | * any scheduled or pending requests. If another resume has been started |
| 446 | * earlier, either return imediately or wait for it to finish, depending on the | 446 | * earlier, either return immediately or wait for it to finish, depending on the |
| 447 | * RPM_NOWAIT and RPM_ASYNC flags. Similarly, if there's a suspend running in | 447 | * RPM_NOWAIT and RPM_ASYNC flags. Similarly, if there's a suspend running in |
| 448 | * parallel with this function, either tell the other process to resume after | 448 | * parallel with this function, either tell the other process to resume after |
| 449 | * suspending (deferred_resume) or wait for it to finish. If the RPM_ASYNC | 449 | * suspending (deferred_resume) or wait for it to finish. If the RPM_ASYNC |