diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-05-19 12:26:57 -0700 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-05-19 12:26:57 -0700 |
| commit | 7e2987503dda95a5f80290bb8c06279009c2419e (patch) | |
| tree | e841944c911ada8d2b806e13d2c7b7320adaeb2f /kernel/power/main.c | |
| parent | b1a45695bde0204597957e448923f09ce271ca80 (diff) | |
| parent | 49a43876b935c811cfd29d8fe998a6912a1cc5c4 (diff) | |
| download | talos-op-linux-7e2987503dda95a5f80290bb8c06279009c2419e.tar.gz talos-op-linux-7e2987503dda95a5f80290bb8c06279009c2419e.zip | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'kernel/power/main.c')
| -rw-r--r-- | kernel/power/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 7960ddf04a57..4cdebc972ff2 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -156,14 +156,14 @@ static int enter_state(suspend_state_t state) goto Unlock; } - pr_debug("PM: Preparing system for suspend\n"); + pr_debug("PM: Preparing system for %s sleep\n", pm_states[state]); if ((error = suspend_prepare(state))) goto Unlock; - pr_debug("PM: Entering state.\n"); + pr_debug("PM: Entering %s sleep\n", pm_states[state]); error = suspend_enter(state); - pr_debug("PM: Finishing up.\n"); + pr_debug("PM: Finishing wakeup.\n"); suspend_finish(state); Unlock: up(&pm_sem); |
