SOURCES (LINUX_2_6_20): kernel-i386.config, kernel-suspend2.config...

[mguevara]

Author: mguevara                     Date: Fri Jan 12 11:00:07 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6_20
---- Log message:
- suspend2 options update and cleanup

---- Files affected:
SOURCES:
   kernel-i386.config (1.82.10.160.2.1 -> 1.82.10.160.2.2) , kernel-suspend2.config (1.1.2.4 -> 1.1.2.4.2.1) 

---- Diffs:

================================================================
Index: SOURCES/kernel-i386.config
diff -u SOURCES/kernel-i386.config:1.82.10.160.2.1 SOURCES/kernel-i386.config:1.82.10.160.2.2
--- SOURCES/kernel-i386.config:1.82.10.160.2.1	Mon Jan  8 16:47:12 2007
+++ SOURCES/kernel-i386.config	Fri Jan 12 12:00:02 2007
@@ -226,21 +226,11 @@
 # CONFIG_PM_DEBUG is not set
 # CONFIG_PM_SYSFS_DEPRECATED is not set
 # CONFIG_SOFTWARE_SUSPEND is not set
-CONFIG_SUSPEND2_CRYPTO=y
-CONFIG_SUSPEND2=y
-
-#
-# Image Storage (you need at least one allocator)
-#
-CONFIG_SUSPEND2_FILE=y
-CONFIG_SUSPEND2_SWAP=y
 
 #
 # General Options
 #
-CONFIG_SUSPEND2_DEFAULT_RESUME2=""
-# CONFIG_SUSPEND2_KEEP_IMAGE is not set
-# CONFIG_SUSPEND2_REPLACE_SWSUSP is not set
+
 CONFIG_SUSPEND_SHARED=y
 
 #

================================================================
Index: SOURCES/kernel-suspend2.config
diff -u SOURCES/kernel-suspend2.config:1.1.2.4 SOURCES/kernel-suspend2.config:1.1.2.4.2.1
--- SOURCES/kernel-suspend2.config:1.1.2.4	Wed Sep 20 15:26:23 2006
+++ SOURCES/kernel-suspend2.config	Fri Jan 12 12:00:02 2007
@@ -1,11 +1,21 @@
-# CONFIG_SOFTWARE_SUSPEND is not set
-# CONFIG_SUSPEND_DEBUG_PAGEALLOC is not set
+#
+# Power management options (ACPI, APM)
+#
+CONFIG_SUSPEND2_CORE=y
+
+#
+# Image Storage (you need at least one allocator)
+#
+CONFIG_SUSPEND2_FILE=y
+CONFIG_SUSPEND2_SWAP=y
+
+#
+# General Options
+#
 CONFIG_SUSPEND2_CRYPTO=y
-CONFIG_SUSPEND2=y
-CONFIG_SUSPEND2_FILEWRITER=y
-CONFIG_SUSPEND2_SWAPWRITER=y
 CONFIG_SUSPEND2_DEFAULT_RESUME2=""
-CONFIG_SUSPEND2_KEEP_IMAGE=n
-CONFIG_CRYPTO_LZF=m
-# CONFIG_SOFTWARE_REPLACE_SLEEP is not set
+# CONFIG_SUSPEND2_KEEP_IMAGE is not set
 # CONFIG_SUSPEND2_REPLACE_SWSUSP is not set
+# CONFIG_SUSPEND2_CHECKSUM is not set
+CONFIG_SUSPEND2=y
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.160.2.1&r2=1.82.10.160.2.2&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-suspend2.config?r1=1.1.2.4&r2=1.1.2.4.2.1&f=u