Merge tag 'v4.1-rockchip-socfixes1' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index c6f299ba25cb6c9d610507e138c7eb57dc535268..aeb5729fbda61976de6501ec75ca26c2628c623c 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -95,9 +95,11 @@ config PINCTRL_FALCON
 
 config PINCTRL_MESON
        bool
+       depends on OF
        select PINMUX
        select PINCONF
        select GENERIC_PINCONF
+       select GPIOLIB
        select OF_GPIO
        select REGMAP_MMIO
 
@@ -229,7 +231,8 @@ config PINCTRL_XWAY
 
 config PINCTRL_TB10X
        bool
-       depends on ARC_PLAT_TB10X
+       depends on OF && ARC_PLAT_TB10X
+       select GPIOLIB
 
 endmenu