Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / Kconfig

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 8542cd4a176aec39c7f4d2871977ad5d90b4cbbc..b6e864e8c9e82df756fc6aa3d227a7e57627c1fa 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -252,7 +252,7 @@ config PINCTRL_SAMSUNG
 
 config PINCTRL_EXYNOS
        bool "Pinctrl driver data for Samsung EXYNOS SoCs other than 5440"
-       depends on OF && GPIOLIB && ARCH_EXYNOS
+       depends on OF && GPIOLIB && (ARCH_EXYNOS || ARCH_S5PV210)
        select PINCTRL_SAMSUNG
 
 config PINCTRL_EXYNOS5440
@@ -262,8 +262,9 @@ config PINCTRL_EXYNOS5440
        select PINCONF
 
 config PINCTRL_PALMAS
-       bool "Pinctrl driver for the PALMA Series MFD devices"
+       bool "Pinctrl driver for the PALMAS Series MFD devices"
        depends on OF && MFD_PALMAS
+       select PINMUX
        select GENERIC_PINCONF
        help
          Palmas device supports the configuration of pins for different