diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 10:42:24 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 10:42:24 +0900 |
commit | e641d15869473d238d4beb0d79dd97a0f7d14e73 (patch) | |
tree | 08a7ff4dcdff83cff76f8e6eb675b172a78a263d /arch/arm/mach-s5pv310/Kconfig | |
parent | 387c31c7e5c9805b0aef8833d1731a5fe7bdea14 (diff) | |
parent | d8a2d39d9e1d023b7eb4ea559d2baa668d3eb6c7 (diff) | |
download | kernel_samsung_aries-e641d15869473d238d4beb0d79dd97a0f7d14e73.zip kernel_samsung_aries-e641d15869473d238d4beb0d79dd97a0f7d14e73.tar.gz kernel_samsung_aries-e641d15869473d238d4beb0d79dd97a0f7d14e73.tar.bz2 |
Merge branch 'next-samsung-asoc2' into for-next-new
Diffstat (limited to 'arch/arm/mach-s5pv310/Kconfig')
-rw-r--r-- | arch/arm/mach-s5pv310/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv310/Kconfig b/arch/arm/mach-s5pv310/Kconfig index 1150b36..3e1fe9d 100644 --- a/arch/arm/mach-s5pv310/Kconfig +++ b/arch/arm/mach-s5pv310/Kconfig @@ -11,6 +11,7 @@ if ARCH_S5PV310 config CPU_S5PV310 bool + select S3C_PL330_DMA help Enable S5PV310 CPU support @@ -69,10 +70,12 @@ config MACH_SMDKC210 select CPU_S5PV310 select S3C_DEV_RTC select S3C_DEV_WDT + select S3C_DEV_I2C1 select S3C_DEV_HSMMC select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC3 + select S5PV310_SETUP_I2C1 select S5PV310_SETUP_SDHCI help Machine support for Samsung SMDKC210 @@ -97,10 +100,12 @@ config MACH_SMDKV310 select CPU_S5PV310 select S3C_DEV_RTC select S3C_DEV_WDT + select S3C_DEV_I2C1 select S3C_DEV_HSMMC select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC3 + select S5PV310_SETUP_I2C1 select S5PV310_SETUP_SDHCI help Machine support for Samsung SMDKV310 |