[ARM] 3956/1: AT91: Carmeva board update

[linux-2.6-omap-h63xx.git] / arch / arm / configs / ixp4xx_defconfig

diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig
index 4975b914f923407667579aee4aae907c80f4bdb8..fac7c3b240c0574b659fc791508dc6d0b866df4c 100644 (file)
--- a/arch/arm/configs/ixp4xx_defconfig
+++ b/arch/arm/configs/ixp4xx_defconfig
@@ -206,10 +206,8 @@ CONFIG_BINFMT_ELF=y
 #
 # Power management options
 #
-CONFIG_PM=y
-CONFIG_PM_LEGACY=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_APM=y
+# CONFIG_PM is not set
+# CONFIG_APM is not set
 
 #
 # Networking