sh: Support explicit L1 cache disabling.

[linux-2.6-omap-h63xx.git] / arch / x86_64 / defconfig

diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index b7c4cd04bfc3c08d5711e3215d476ad3e629e272..b091c5e35558c1daedf34688e296c08166f85f60 100644 (file)
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@ -199,9 +199,8 @@ CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
-CONFIG_SOFTWARE_SUSPEND=y
+CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
-CONFIG_SUSPEND_SMP=y
 
 #
 # ACPI (Advanced Configuration and Power Interface) Support