summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-05-28 09:35:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-05-28 09:35:04 -0700
commit9fb67d643f6f1892a08ee3a04ea54022d1060bb0 (patch)
tree5e4db1f8f46cc1b94dcced8dced050165b9fdd3e /drivers/pinctrl/Kconfig
parentca6584a3316c445d72e9795dc0765a0f30d83293 (diff)
parentb1fa7d8592c730d1b44536b5cacadeb318d369fd (diff)
downloadlinux-9fb67d643f6f1892a08ee3a04ea54022d1060bb0.tar.bz2
Merge tag 'pinctrl-v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control fixes from Linus Walleij: "The commits that stand out are the Intel fixes that arrived during the merge window and I got relayed by pull request from Andy. Apart from that a minor Kconfig noise. - Interrupt clearing fix for the Intel pin controllers affecting touchpads on some laptops. - Compile Kconfig fix for the STMFX expander pin controller" * tag 'pinctrl-v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: pinctrl: stmfx: Fix compile issue when CONFIG_OF_GPIO is not defined pinctrl: intel: Clear interrupt status in mask/unmask callback pinctrl: intel: Use GENMASK() consistently
Diffstat (limited to 'drivers/pinctrl/Kconfig')
-rw-r--r--drivers/pinctrl/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 0522c2224147..b372419d61f2 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -277,7 +277,7 @@ config PINCTRL_ST
config PINCTRL_STMFX
tristate "STMicroelectronics STMFX GPIO expander pinctrl driver"
depends on I2C
- depends on OF || COMPILE_TEST
+ depends on OF_GPIO
select GENERIC_PINCONF
select GPIOLIB_IRQCHIP
select MFD_STMFX