Merge commit 'v2.6.29-rc1' into core/urgent

[karo-tx-linux.git] / arch / arm / configs / assabet_defconfig

diff --git a/arch/arm/configs/assabet_defconfig b/arch/arm/configs/assabet_defconfig
index 089c9d598409ca4ce27d23beee02519c9e2507d4..b1cd331aaecf27d3bc39f310af44df52833f2253 100644 (file)
--- a/arch/arm/configs/assabet_defconfig
+++ b/arch/arm/configs/assabet_defconfig
@@ -184,6 +184,7 @@ CONFIG_BINFMT_ELF=y
 # Power management options
 #
 CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
 # CONFIG_APM is not set
 
 #