Redo commit after TuxOnIce merge

diff --git a/.config b/.config
index d76fbba59ff809802cf2be45bdf21b7bda5d013c..f1f0f910bf0142c33242c53728249f221b1f2d5f 100644 (file)
--- a/.config
+++ b/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.24.3-zb5s
-# Thu Feb 28 10:56:52 2008
+# Thu Feb 28 11:41:48 2008
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -272,6 +272,7 @@ CONFIG_PM=y
 CONFIG_PM_LEGACY=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_VERBOSE=y
+CONFIG_PRINTK_NOSAVE=y
 # CONFIG_PM_TRACE is not set
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_SLEEP=y
@@ -280,6 +281,37 @@ CONFIG_SUSPEND=y
 CONFIG_HIBERNATION_SMP_POSSIBLE=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
+CONFIG_TOI_CORE=y
+
+#
+# Image Storage (you need at least one allocator)
+#
+CONFIG_TOI_FILE=y
+CONFIG_TOI_SWAP=y
+
+#
+# General Options
+#
+CONFIG_TOI_DEFAULT_PRE_HIBERNATE=""
+CONFIG_TOI_DEFAULT_POST_HIBERNATE=""
+CONFIG_TOI_CRYPTO=y
+CONFIG_TOI_USERUI=y
+CONFIG_TOI_USERUI_DEFAULT_PATH="/usr/local/sbin/tuxonice_fbsplash"
+CONFIG_TOI_KEEP_IMAGE=y
+CONFIG_TOI_REPLACE_SWSUSP=y
+CONFIG_TOI_CLUSTER=m
+CONFIG_TOI_DEFAULT_CLUSTER_INTERFACE=""
+CONFIG_TOI_DEFAULT_CLUSTER_KEY="Default"
+CONFIG_TOI_CLUSTER_IMAGE_TIMEOUT=15
+CONFIG_TOI_CLUSTER_WAIT_UNTIL_NODES=0
+CONFIG_TOI_DEFAULT_CLUSTER_PRE_HIBERNATE=""
+CONFIG_TOI_DEFAULT_CLUSTER_POST_HIBERNATE=""
+CONFIG_TOI_CHECKSUM=y
+CONFIG_TOI_DEFAULT_WAIT=25
+CONFIG_TOI_PAGEFLAGS_TEST=m
+CONFIG_TOI_PAGEFLAGS_EXPORTS=y
+CONFIG_TOI_EXPORTS=y
+CONFIG_TOI=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_PROCFS=y
@@ -3996,6 +4028,7 @@ CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_LZF=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CAMELLIA=m