- update

Changed files:
    kernel-i386-smp.config -> 1.76
    kernel-i386.config -> 1.99

diff --git a/kernel-i386-smp.config b/kernel-i386-smp.config
index 9d4b73836d0d3a9389a646c231f6ac6679297b9d..3c9e5eaa5e33b503a52af41a22222105ff73a9fa 100644 (file)
--- a/kernel-i386-smp.config
+++ b/kernel-i386-smp.config
@@ -144,14 +144,12 @@ CONFIG_SOFTWARE_SUSPEND2_WRITER=y
 # Image Storage (you need at least one writer)
 #
 CONFIG_SOFTWARE_SUSPEND_SWAPWRITER=m
-CONFIG_SOFTWARE_SUSPEND_NULLWRITER=m
 
 #
 # Page Transformers
 #
 CONFIG_SOFTWARE_SUSPEND_LZF_COMPRESSION=m
 CONFIG_SOFTWARE_SUSPEND_GZIP_COMPRESSION=m
-CONFIG_SOFTWARE_SUSPEND_NULLTRANSFORMER=m
 
 #
 # User Interface Options
@@ -162,7 +160,6 @@ CONFIG_SOFTWARE_SUSPEND_TEXT_MODE=m
 #
 # General Options
 #
-CONFIG_SOFTWARE_SUSPEND_ACPI=y
 # CONFIG_SOFTWARE_SUSPEND_RELAXED_PROC is not set
 CONFIG_SOFTWARE_SUSPEND_DEFAULT_RESUME2=""
 CONFIG_SOFTWARE_SUSPEND_KEEP_IMAGE=y
@@ -172,8 +169,6 @@ CONFIG_SOFTWARE_SUSPEND_KEEP_IMAGE=y
 #
 # CONFIG_SOFTWARE_SUSPEND_DEBUG is not set
 CONFIG_SOFTWARE_SUSPEND_CHECKSUMS=m
-# CONFIG_SOFTWARE_SUSPEND_VARIATION_ANALYSIS is not set
-CONFIG_SOFTWARE_SUSPEND2_DUMP=y
 
 #
 # ACPI (Advanced Configuration and Power Interface) Support

diff --git a/kernel-i386.config b/kernel-i386.config
index cf9a8ca3f2623f337640683a31a0d755bc1dbfe5..80a14694bf03d4fbe94dfcd5eb8ea2576b801f96 100644 (file)
--- a/kernel-i386.config
+++ b/kernel-i386.config
@@ -142,14 +142,12 @@ CONFIG_SOFTWARE_SUSPEND2_WRITER=y
 # Image Storage (you need at least one writer)
 #
 CONFIG_SOFTWARE_SUSPEND_SWAPWRITER=m
-CONFIG_SOFTWARE_SUSPEND_NULLWRITER=m
 
 #
 # Page Transformers
 #
 CONFIG_SOFTWARE_SUSPEND_LZF_COMPRESSION=m
 CONFIG_SOFTWARE_SUSPEND_GZIP_COMPRESSION=m
-CONFIG_SOFTWARE_SUSPEND_NULLTRANSFORMER=m
 
 #
 # User Interface Options
@@ -160,7 +158,6 @@ CONFIG_SOFTWARE_SUSPEND_TEXT_MODE=m
 #
 # General Options
 #
-CONFIG_SOFTWARE_SUSPEND_ACPI=y
 # CONFIG_SOFTWARE_SUSPEND_RELAXED_PROC is not set
 CONFIG_SOFTWARE_SUSPEND_DEFAULT_RESUME2=""
 CONFIG_SOFTWARE_SUSPEND_KEEP_IMAGE=y
@@ -170,8 +167,6 @@ CONFIG_SOFTWARE_SUSPEND_KEEP_IMAGE=y
 #
 # CONFIG_SOFTWARE_SUSPEND_DEBUG is not set
 CONFIG_SOFTWARE_SUSPEND_CHECKSUMS=m
-# CONFIG_SOFTWARE_SUSPEND_VARIATION_ANALYSIS is not set
-CONFIG_SOFTWARE_SUSPEND2_DUMP=y
 
 #
 # ACPI (Advanced Configuration and Power Interface) Support