Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / arch / arm / mach-exynos / Kconfig

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 7ec64c8c9917848f133df6e04f59df0b146ff956..4372075c551f922380dbd66467221584cd8c902c 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -408,6 +408,8 @@ config MACH_EXYNOS4_DT
        select USE_OF
        select ARM_AMBA
        select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
+       select PINCTRL
+       select PINCTRL_EXYNOS4
        help
          Machine support for Samsung Exynos4 machine with device tree enabled.
          Select this if a fdt blob is available for the Exynos4 SoC based board.
@@ -421,8 +423,8 @@ config MACH_EXYNOS5_DT
        select USE_OF
        select ARM_AMBA
        help
-         Machine support for Samsung Exynos4 machine with device tree enabled.
-         Select this if a fdt blob is available for the EXYNOS4 SoC based board.
+         Machine support for Samsung EXYNOS5 machine with device tree enabled.
+         Select this if a fdt blob is available for the EXYNOS5 SoC based board.
 
 if ARCH_EXYNOS4