From: Ben Dooks Date: Sat, 22 May 2010 01:47:27 +0000 (+0100) Subject: ARM: s3c6400_defconfig: enable power management X-Git-Tag: v2.6.35-rc1~264^2~1^2^2~2 X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=13aa16b9ccf4ff5eff3886df3cb0a071dbc73cfc;p=net-next-2.6.git ARM: s3c6400_defconfig: enable power management Enable power management in the default build Signed-off-by: Ben Dooks --- diff --git a/arch/arm/configs/s3c6400_defconfig b/arch/arm/configs/s3c6400_defconfig index 46781305e71..f3509379e68 100644 --- a/arch/arm/configs/s3c6400_defconfig +++ b/arch/arm/configs/s3c6400_defconfig @@ -169,7 +169,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set # CONFIG_MUTEX_SPIN_ON_OWNER is not set -# CONFIG_FREEZER is not set +CONFIG_FREEZER=y # # System Type @@ -256,6 +256,9 @@ CONFIG_S3C_DEV_NAND=y # # Power management # +# CONFIG_SAMSUNG_PM_DEBUG is not set +# CONFIG_S3C_PM_DEBUG_LED_SMDK is not set +# CONFIG_SAMSUNG_PM_CHECK is not set CONFIG_PLAT_S3C64XX=y CONFIG_CPU_S3C6410=y # CONFIG_S3C64XX_DMA is not set @@ -380,7 +383,14 @@ CONFIG_HAVE_AOUT=y # # Power management options # -# CONFIG_PM is not set +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_APM_EMULATION is not set +# CONFIG_PM_RUNTIME is not set +CONFIG_PM_OPS=y CONFIG_ARCH_SUSPEND_POSSIBLE=y # CONFIG_NET is not set