r4714 - in dists/trunk/linux-2.6/debian: . arch/i386

[maximilian attems]

Author: maks-guest
Date: 2005-11-03 11:09:52 +0000 (Thu, 03 Nov 2005)
New Revision: 4714

Modified:
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/changelog
Log:
reenable swsusp


Modified: dists/trunk/linux-2.6/debian/arch/i386/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	2005-11-03 07:46:21 UTC (rev 4713)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	2005-11-03 11:09:52 UTC (rev 4714)
@@ -55,7 +55,8 @@
 # CONFIG_REGPARM is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
-# CONFIG_SOFTWARE_SUSPEND is not set
+CONFIG_SOFTWARE_SUSPEND=y
+CONFIG_PM_STD_PARTITION=""
 CONFIG_ACPI=y
 CONFIG_ACPI_BOOT=y
 CONFIG_ACPI_INTERPRETER=y

Modified: dists/trunk/linux-2.6/debian/changelog
===================================================================
--- dists/trunk/linux-2.6/debian/changelog	2005-11-03 07:46:21 UTC (rev 4713)
+++ dists/trunk/linux-2.6/debian/changelog	2005-11-03 11:09:52 UTC (rev 4714)
@@ -6,8 +6,12 @@
   [ Sven Luther ]
   * Set default TCP congestion algorithm to NewReno + BIC (Closes: #337089)
 
- -- Sven Luther <luther at debian.org>  Wed,  2 Nov 2005 16:35:12 +0000
+  [ maximilian attems ]
+  * Reenable CONFIG_SOFTWARE_SUSPEND on i386, resume=/dev/<other device> must
+    be set by boot loader.
 
+ -- maximilian attems <maks at sternwelten.at>  Thu,  3 Nov 2005 12:06:29 +0100
+
 linux-2.6 (2.6.14-2) unstable; urgency=low
 
   [ Simon Horman ]