projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...
[cascardo/linux.git]
/
drivers
/
power
/
Kconfig
diff --git
a/drivers/power/Kconfig
b/drivers/power/Kconfig
index
6bff735
..
acd4a15
100644
(file)
--- a/
drivers/power/Kconfig
+++ b/
drivers/power/Kconfig
@@
-309,6
+309,7
@@
config BATTERY_RX51
config CHARGER_ISP1704
tristate "ISP1704 USB Charger Detection"
depends on USB_PHY
config CHARGER_ISP1704
tristate "ISP1704 USB Charger Detection"
depends on USB_PHY
+ depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't be 'y'
help
Say Y to enable support for USB Charger Detection with
ISP1707/ISP1704 USB transceivers.
help
Say Y to enable support for USB Charger Detection with
ISP1707/ISP1704 USB transceivers.