summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-22 02:47:27 +0100
committerBen Dooks <ben-linux@fluff.org>2010-05-23 16:27:11 +0100
commit13aa16b9ccf4ff5eff3886df3cb0a071dbc73cfc (patch)
tree8b0446f12f282f8bdcca80c1f314568397f38994 /arch
parent2621a181fd822c0c9cf3eb8b757aeed58e0d30ee (diff)
downloadop-kernel-dev-13aa16b9ccf4ff5eff3886df3cb0a071dbc73cfc.zip
op-kernel-dev-13aa16b9ccf4ff5eff3886df3cb0a071dbc73cfc.tar.gz
ARM: s3c6400_defconfig: enable power management
Enable power management in the default build Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/s3c6400_defconfig14
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/configs/s3c6400_defconfig b/arch/arm/configs/s3c6400_defconfig
index 46781305..f350937 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
OpenPOWER on IntegriCloud