diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-07-20 15:03:46 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-07-20 15:03:46 +0000 |
| commit | 3050bcad9250b24a8e938d85b27f66356bad95c6 (patch) | |
| tree | 189824097dcf1d5c05d7313e47d4a3ef5688e289 /drivers/gpio | |
| parent | 909767eaf44d67f51a0eba5dc9260ca43851363c (diff) | |
| parent | 8b24c7edc2f285b2eff7af7dcf02f752ae03b5b6 (diff) | |
Merge tag 'v5.4.130' into 5.4-2.3.x-imx
Linux 5.4.130
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index b9728ae26d47..deea0a292664 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -1252,6 +1252,7 @@ config GPIO_TPS68470 config GPIO_TQMX86 tristate "TQ-Systems QTMX86 GPIO" depends on MFD_TQMX86 || COMPILE_TEST + depends on HAS_IOPORT_MAP select GPIOLIB_IRQCHIP help This driver supports GPIO on the TQMX86 IO controller. @@ -1319,6 +1320,7 @@ menu "PCI GPIO expanders" config GPIO_AMD8111 tristate "AMD 8111 GPIO driver" depends on X86 || COMPILE_TEST + depends on HAS_IOPORT_MAP help The AMD 8111 south bridge contains 32 GPIO pins which can be used. |