OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6161b2c
)
[PATCH] pm: clean up /sys/power/disk
author
Pavel Machek
<pavel@ucw.cz>
Sat, 3 Sep 2005 22:57:06 +0000
(15:57 -0700)
committer
Linus Torvalds
<torvalds@evo.osdl.org>
Mon, 5 Sep 2005 07:06:18 +0000
(
00:06
-0700)
Clean code up a bit, and only show suspend to disk as available when
it is configured in.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
kernel/power/main.c
patch
|
blob
|
history
diff --git
a/kernel/power/main.c
b/kernel/power/main.c
index
71aa0fd
..
22bdc93
100644
(file)
--- a/
kernel/power/main.c
+++ b/
kernel/power/main.c
@@
-143,11
+143,12
@@
static void suspend_finish(suspend_state_t state)
-static char *
pm_states[
] = {
+static char *
pm_states[PM_SUSPEND_MAX
] = {
[PM_SUSPEND_STANDBY] = "standby",
[PM_SUSPEND_MEM] = "mem",
+#ifdef CONFIG_SOFTWARE_SUSPEND
[PM_SUSPEND_DISK] = "disk",
- NULL,
+#endif
};