git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull bugfix into test branch
[safe/jmp/linux-2.6]
/
kernel
/
power
/
main.c
diff --git
a/kernel/power/main.c
b/kernel/power/main.c
index
500eb87
..
ff3a618
100644
(file)
--- a/
kernel/power/main.c
+++ b/
kernel/power/main.c
@@
-29,7
+29,7
@@
DEFINE_MUTEX(pm_mutex);
struct pm_ops *pm_ops;
-suspend_disk_method_t pm_disk_mode = PM_DISK_
SHUTDOWN
;
+suspend_disk_method_t pm_disk_mode = PM_DISK_
PLATFORM
;
/**
* pm_set_ops - Set the global power method table.