Pull bugfix into test branch

Conflicts:

	kernel/power/disk.c
This commit is contained in:
Len Brown 2006-12-16 01:01:18 -05:00
commit cfee47f99b
3 changed files with 14 additions and 12 deletions

View file

@ -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.