diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-31 10:52:05 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-31 10:52:05 +0900 |
| commit | 285dee7ff4fb4b32838694d4378f4aa938cf5b43 (patch) | |
| tree | fa15cd1b385898f01ead4649712f6e4fbcd055cd /arch/arm/mach-s5pv310/Kconfig | |
| parent | 0ae9a22b45b9e9d0f6058e5257b2daf48036dd35 (diff) | |
| parent | fa353e9f409340cefc7650854065cbcea85c347d (diff) | |
Merge branch 'next-s5pv310' into for-next
Conflicts:
arch/arm/mach-s5pv310/Kconfig
arch/arm/mach-s5pv310/Makefile
arch/arm/mach-s5pv310/mach-smdkc210.c
arch/arm/mach-s5pv310/mach-smdkv310.c
arch/arm/plat-samsung/include/plat/devs.h
Diffstat (limited to 'arch/arm/mach-s5pv310/Kconfig')
| -rw-r--r-- | arch/arm/mach-s5pv310/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv310/Kconfig b/arch/arm/mach-s5pv310/Kconfig index 3e1fe9d6b1f..b7aa3cd2198 100644 --- a/arch/arm/mach-s5pv310/Kconfig +++ b/arch/arm/mach-s5pv310/Kconfig @@ -15,6 +15,11 @@ config CPU_S5PV310 help Enable S5PV310 CPU support +config S5PV310_DEV_PD + bool + help + Compile in platform device definitions for Power Domain + config S5PV310_SETUP_I2C1 bool help @@ -75,6 +80,7 @@ config MACH_SMDKC210 select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC3 + select S5PV310_DEV_PD select S5PV310_SETUP_I2C1 select S5PV310_SETUP_SDHCI help @@ -85,6 +91,10 @@ config MACH_UNIVERSAL_C210 bool "Mobile UNIVERSAL_C210 Board" select CPU_S5PV310 select S5P_DEV_ONENAND + select S3C_DEV_HSMMC + select S3C_DEV_HSMMC2 + select S3C_DEV_HSMMC3 + select S5PV310_SETUP_SDHCI select S3C_DEV_I2C1 select S5PV310_SETUP_I2C1 help @@ -105,6 +115,7 @@ config MACH_SMDKV310 select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC3 + select S5PV310_DEV_PD select S5PV310_SETUP_I2C1 select S5PV310_SETUP_SDHCI help |