Merge branch 'master' into csb1725

[mv-sheeva.git] / arch / arm / mach-s3c2416 / Kconfig

diff --git a/arch/arm/mach-s3c2416/Kconfig b/arch/arm/mach-s3c2416/Kconfig
index 657e4fe17f399cb038b8528966822b6f029fbb6e..df8d14974c90876b31d16ab2a2d2367ef1f7af89 100644 (file)
--- a/arch/arm/mach-s3c2416/Kconfig
+++ b/arch/arm/mach-s3c2416/Kconfig
@@ -25,14 +25,24 @@ config S3C2416_DMA
        help
          Internal config node for S3C2416 DMA support
 
+config S3C2416_PM
+       bool
+       select S3C2412_PM_SLEEP
+       help
+         Internal config node to apply S3C2416 power management
+
 menu "S3C2416 Machines"
 
 config MACH_SMDK2416
        bool "SMDK2416"
        select CPU_S3C2416
+       select MACH_SMDK
        select S3C_DEV_FB
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC1
+       select S3C_DEV_NAND
+       select S3C_DEV_USB_HOST
+       select S3C2416_PM if PM
        help
          Say Y here if you are using an SMDK2416