diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-16 12:46:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-16 12:46:09 +0200 |
| commit | bb0925b283fe558fa9530c9d0b6158e9b6c9dfa6 (patch) | |
| tree | 239b3e2c24ca9271b68a66485912b9f2c0e025f6 /drivers | |
| parent | 2aae471d66c108b78493be1147e707bca6331e50 (diff) | |
| parent | 86baf800de84eb89615c138d368b14bff5ee7d8a (diff) | |
Merge tag 'extcon-fixes-for-5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus
Chanwoo writes:
Update extcon for v5.1-rc4
Detailed description for this pull request:
1. Fix the build issue of extcon-ptn5150.c driver by editing
the module dependency in Kconfig.
* tag 'extcon-fixes-for-5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon:
extcon: ptn5150: fix COMPILE_TEST dependencies
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/extcon/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig index 8e17149655f0..540e8cd16ee6 100644 --- a/drivers/extcon/Kconfig +++ b/drivers/extcon/Kconfig @@ -116,7 +116,7 @@ config EXTCON_PALMAS config EXTCON_PTN5150 tristate "NXP PTN5150 CC LOGIC USB EXTCON support" - depends on I2C && GPIOLIB || COMPILE_TEST + depends on I2C && (GPIOLIB || COMPILE_TEST) select REGMAP_I2C help Say Y here to enable support for USB peripheral and USB host |