diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-12-10 10:11:00 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-12-10 10:11:00 +0100 |
| commit | 2040cf9f59037aa8aec749363e69ead165b67b43 (patch) | |
| tree | e9c15448e841cc493bc80b9f658d7955623e86dd /drivers/pinctrl/freescale | |
| parent | kprobes: Set unoptimized flag after unoptimizing code (diff) | |
| parent | Linux 5.5-rc1 (diff) | |
| download | linux-2040cf9f59037aa8aec749363e69ead165b67b43.tar.xz linux-2040cf9f59037aa8aec749363e69ead165b67b43.zip | |
Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/pinctrl/freescale')
| -rw-r--r-- | drivers/pinctrl/freescale/Kconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pinctrl/freescale/Kconfig b/drivers/pinctrl/freescale/Kconfig index 5f4058033ec6..3ea9ce3e0cd9 100644 --- a/drivers/pinctrl/freescale/Kconfig +++ b/drivers/pinctrl/freescale/Kconfig @@ -39,12 +39,12 @@ config PINCTRL_IMX27 config PINCTRL_IMX25 - bool "IMX25 pinctrl driver" - depends on OF - depends on SOC_IMX25 - select PINCTRL_IMX - help - Say Y here to enable the imx25 pinctrl driver + bool "IMX25 pinctrl driver" + depends on OF + depends on SOC_IMX25 + select PINCTRL_IMX + help + Say Y here to enable the imx25 pinctrl driver config PINCTRL_IMX35 bool "IMX35 pinctrl driver" |