Merge ../to-linus-stable/

[sfrench/cifs-2.6.git] / arch / i386 / defconfig

diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 28e620383799a1a05ecf82fb11bd9bf275ff19f6..ca07b95c06b82e6eeffd79fd3649b4c3ca22b8b5 100644 (file)
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -126,7 +126,6 @@ CONFIG_HAVE_DEC_LOCK=y
 #
 CONFIG_PM=y
 CONFIG_SOFTWARE_SUSPEND=y
-# CONFIG_PM_DISK is not set
 
 #
 # ACPI (Advanced Configuration and Power Interface) Support