Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 857b4fa091244758b5fc0976cf44d58f914f20ec..ae44a70aae8acb4664ca46107d04525205c32ad6 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -100,18 +100,6 @@ config PM_STD_PARTITION
          suspended image to. It will simply pick the first available swap 
          device.
 
-config SWSUSP_ENCRYPT
-       bool "Encrypt suspend image"
-       depends on SOFTWARE_SUSPEND && CRYPTO=y && (CRYPTO_AES=y || CRYPTO_AES_586=y || CRYPTO_AES_X86_64=y)
-       default ""
-       ---help---
-         To prevent data gathering from swap after resume you can encrypt
-         the suspend image with a temporary key that is deleted on
-         resume.
-
-         Note that the temporary key is stored unencrypted on disk while the
-         system is suspended.
-
 config SUSPEND_SMP
        bool
        depends on HOTPLUG_CPU && X86 && PM