Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb0925b2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'extcon-fixes-for-5.1-rc4' of... 

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
parents 2aae471d 86baf800

drivers/extcon/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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