diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-05-21 21:47:27 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-23 11:27:11 -0400 |
commit | 13aa16b9ccf4ff5eff3886df3cb0a071dbc73cfc (patch) | |
tree | 8b0446f12f282f8bdcca80c1f314568397f38994 | |
parent | 2621a181fd822c0c9cf3eb8b757aeed58e0d30ee (diff) |
ARM: s3c6400_defconfig: enable power management
Enable power management in the default build
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r-- | arch/arm/configs/s3c6400_defconfig | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/configs/s3c6400_defconfig b/arch/arm/configs/s3c6400_defconfig index 46781305e713..f3509379e680 100644 --- a/arch/arm/configs/s3c6400_defconfig +++ b/arch/arm/configs/s3c6400_defconfig | |||
@@ -169,7 +169,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" | |||
169 | # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set | 169 | # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set |
170 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | 170 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set |
171 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | 171 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set |
172 | # CONFIG_FREEZER is not set | 172 | CONFIG_FREEZER=y |
173 | 173 | ||
174 | # | 174 | # |
175 | # System Type | 175 | # System Type |
@@ -256,6 +256,9 @@ CONFIG_S3C_DEV_NAND=y | |||
256 | # | 256 | # |
257 | # Power management | 257 | # Power management |
258 | # | 258 | # |
259 | # CONFIG_SAMSUNG_PM_DEBUG is not set | ||
260 | # CONFIG_S3C_PM_DEBUG_LED_SMDK is not set | ||
261 | # CONFIG_SAMSUNG_PM_CHECK is not set | ||
259 | CONFIG_PLAT_S3C64XX=y | 262 | CONFIG_PLAT_S3C64XX=y |
260 | CONFIG_CPU_S3C6410=y | 263 | CONFIG_CPU_S3C6410=y |
261 | # CONFIG_S3C64XX_DMA is not set | 264 | # CONFIG_S3C64XX_DMA is not set |
@@ -380,7 +383,14 @@ CONFIG_HAVE_AOUT=y | |||
380 | # | 383 | # |
381 | # Power management options | 384 | # Power management options |
382 | # | 385 | # |
383 | # CONFIG_PM is not set | 386 | CONFIG_PM=y |
387 | # CONFIG_PM_DEBUG is not set | ||
388 | CONFIG_PM_SLEEP=y | ||
389 | CONFIG_SUSPEND=y | ||
390 | CONFIG_SUSPEND_FREEZER=y | ||
391 | # CONFIG_APM_EMULATION is not set | ||
392 | # CONFIG_PM_RUNTIME is not set | ||
393 | CONFIG_PM_OPS=y | ||
384 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 394 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
385 | # CONFIG_NET is not set | 395 | # CONFIG_NET is not set |
386 | 396 | ||