swsusp: fix default and merge upstream?

[Pavel Machek]

Hi!

Perhaps now is the right time to merge -mm swsusp up to Linus? I'd
like new swsusp to default to powerdown mode (as it did before) before
it goes up (attached patch)... But if you want to test ACPI code paths
even in Linus tree, leave it out.

								Pavel

--- clean-mm/kernel/power/main.c	2004-08-17 12:21:44.000000000 +0200
+++ linux-mm/kernel/power/main.c	2004-08-17 12:22:47.000000000 +0200
@@ -33,8 +33,6 @@
 {
 	down(&pm_sem);
 	pm_ops = ops;
-	if (ops->pm_disk_mode && ops->pm_disk_mode < PM_DISK_MAX)
-		pm_disk_mode = ops->pm_disk_mode;
 	up(&pm_sem);
 }
 

-- 
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/