diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2018-05-11 18:08:10 +0200 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2018-05-11 18:08:10 +0200 |
commit | 94cc2fde365fb4484080ea6675bb1e0c933f8002 (patch) | |
tree | a249c6f6b12ff2dbe39d78bfb050e9c28619bee9 /drivers/pinctrl/stm32/Kconfig | |
parent | drm: Add and handle new aspect ratios in DRM layer (diff) | |
parent | Merge tag 'drm-intel-next-2018-04-13' of git://anongit.freedesktop.org/drm/dr... (diff) | |
download | linux-94cc2fde365fb4484080ea6675bb1e0c933f8002.tar.xz linux-94cc2fde365fb4484080ea6675bb1e0c933f8002.zip |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
drm-misc-next is still based on v4.16-rc7, and was getting a bit stale.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/pinctrl/stm32/Kconfig')
-rw-r--r-- | drivers/pinctrl/stm32/Kconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pinctrl/stm32/Kconfig b/drivers/pinctrl/stm32/Kconfig index 1c4e00b2eb65..cd3936e3afaa 100644 --- a/drivers/pinctrl/stm32/Kconfig +++ b/drivers/pinctrl/stm32/Kconfig @@ -11,37 +11,37 @@ config PINCTRL_STM32 config PINCTRL_STM32F429 bool "STMicroelectronics STM32F429 pin control" if COMPILE_TEST && !MACH_STM32F429 - depends on OF + depends on OF && HAS_IOMEM default MACH_STM32F429 select PINCTRL_STM32 config PINCTRL_STM32F469 bool "STMicroelectronics STM32F469 pin control" if COMPILE_TEST && !MACH_STM32F469 - depends on OF + depends on OF && HAS_IOMEM default MACH_STM32F469 select PINCTRL_STM32 config PINCTRL_STM32F746 bool "STMicroelectronics STM32F746 pin control" if COMPILE_TEST && !MACH_STM32F746 - depends on OF + depends on OF && HAS_IOMEM default MACH_STM32F746 select PINCTRL_STM32 config PINCTRL_STM32F769 bool "STMicroelectronics STM32F769 pin control" if COMPILE_TEST && !MACH_STM32F769 - depends on OF + depends on OF && HAS_IOMEM default MACH_STM32F769 select PINCTRL_STM32 config PINCTRL_STM32H743 bool "STMicroelectronics STM32H743 pin control" if COMPILE_TEST && !MACH_STM32H743 - depends on OF + depends on OF && HAS_IOMEM default MACH_STM32H743 select PINCTRL_STM32 config PINCTRL_STM32MP157 bool "STMicroelectronics STM32MP157 pin control" if COMPILE_TEST && !MACH_STM32MP157 - depends on OF + depends on OF && HAS_IOMEM default MACH_STM32MP157 select PINCTRL_STM32 endif |