diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 01:01:18 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 01:01:18 -0500 |
| commit | cfee47f99bc14a6d7c6b0be2284db2cef310a815 (patch) | |
| tree | 2974594b06534c199ea9c4b39492d5a708bb539a /kernel/power/main.c | |
| parent | 7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c (diff) | |
| parent | 9185cfa92507d07ac787bc73d06c42222eec7239 (diff) | |
Pull bugfix into test branch
Conflicts:
kernel/power/disk.c
Diffstat (limited to 'kernel/power/main.c')
| -rw-r--r-- | kernel/power/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 500eb87f643d..ff3a6182f5f0 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | DEFINE_MUTEX(pm_mutex); | 29 | DEFINE_MUTEX(pm_mutex); |
| 30 | 30 | ||
| 31 | struct pm_ops *pm_ops; | 31 | struct pm_ops *pm_ops; |
| 32 | suspend_disk_method_t pm_disk_mode = PM_DISK_SHUTDOWN; | 32 | suspend_disk_method_t pm_disk_mode = PM_DISK_PLATFORM; |
| 33 | 33 | ||
| 34 | /** | 34 | /** |
| 35 | * pm_set_ops - Set the global power method table. | 35 | * pm_set_ops - Set the global power method table. |