Merge branch 'dev/removing-s5p6442' into for-next

[pandora-kernel.git] / arch / arm / mach-exynos4 / Kconfig

diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index a021b52..11b57a4 100644 (file)
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -20,6 +20,11 @@ config EXYNOS4_MCT
        help
          Use MCT (Multi Core Timer) as kernel timers
 
+config EXYNOS4_DEV_AHCI
+       bool
+       help
+         Compile in platform device definitions for AHCI
+
 config EXYNOS4_DEV_PD
        bool
        help
@@ -134,9 +139,9 @@ config MACH_ARMLEX4210
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC2
        select S3C_DEV_HSMMC3
+       select EXYNOS4_DEV_AHCI
        select EXYNOS4_DEV_SYSMMU
        select EXYNOS4_SETUP_SDHCI
-       select SATA_AHCI_PLATFORM
        help
          Machine support for Samsung ARMLEX4210 based on EXYNOS4210
 
@@ -164,8 +169,10 @@ config MACH_NURI
        select S3C_DEV_HSMMC2
        select S3C_DEV_HSMMC3
        select S3C_DEV_I2C1
+       select S3C_DEV_I2C3
        select S3C_DEV_I2C5
        select EXYNOS4_SETUP_I2C1
+       select EXYNOS4_SETUP_I2C3
        select EXYNOS4_SETUP_I2C5
        select EXYNOS4_SETUP_SDHCI
        select SAMSUNG_DEV_PWM