diff options
| author | Sebastian Reichel <sebastian.reichel@collabora.co.uk> | 2017-07-24 19:42:43 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.co.uk> | 2017-07-24 20:53:15 +0200 |
| commit | d4e2385c691101d0bf412f7c5fecfc279eb919c7 (patch) | |
| tree | 6ea4384bb663d7114c3a17f5b11e61442bdd43fa /drivers/power/supply/Kconfig | |
| parent | 10e48b7d73487114bdd13bc1ebd10b6ba62de25b (diff) | |
| parent | 648b8eba20d0bdce9de41df97677e70aa53693ea (diff) | |
| download | linux-d4e2385c691101d0bf412f7c5fecfc279eb919c7.tar.bz2 | |
Merge branch 'fixes' into for-next
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Diffstat (limited to 'drivers/power/supply/Kconfig')
| -rw-r--r-- | drivers/power/supply/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index 15c80c7f8f9e..6a8bab7ae27b 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -378,6 +378,7 @@ config BATTERY_RX51 config CHARGER_CPCAP tristate "CPCAP PMIC Charger Driver" depends on MFD_CPCAP && IIO + depends on OMAP_USB2 || (!OMAP_USB2 && COMPILE_TEST) default MFD_CPCAP help Say Y to enable support for CPCAP PMIC charger driver for Motorola |