summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-04-27 21:11:48 +0200
committerSebastian Reichel <sre@kernel.org>2017-05-01 11:56:49 +0200
commit6254a6a94489c4be717f757bec7d3a372cba1b6e (patch)
tree9746050bc7d34ac604421c908b5399717a831126 /drivers/power
parent8b20839988f1ed5e534b270f3776709b640dc7e0 (diff)
downloadlinux-stable-6254a6a94489c4be717f757bec7d3a372cba1b6e.tar.gz
linux-stable-6254a6a94489c4be717f757bec7d3a372cba1b6e.tar.bz2
linux-stable-6254a6a94489c4be717f757bec7d3a372cba1b6e.zip
power: supply: axp20x_usb_power: add IIO dependency
When CONFIG_IIO=m and the axp20x_usb_power driver is built-in, we get a link time error: drivers/power/built-in.o: In function `axp20x_usb_power_get_property': undefined reference to `iio_read_channel_processed' drivers/power/built-in.o: In function `axp20x_usb_power_probe': undefined reference to `devm_iio_channel_get' undefined reference to `devm_iio_channel_get' This adds the same dependency that we already have for the AC power driver to the USB power driver. For consistency, I'm also moving the two closer together in the Kconfig file. Fixes: 33863c938caa ("power: supply: axp20x_usb_power: use IIO channels when available") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/supply/Kconfig15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
index 4b718e90b3ca..86f40bf37c34 100644
--- a/drivers/power/supply/Kconfig
+++ b/drivers/power/supply/Kconfig
@@ -250,6 +250,14 @@ config BATTERY_AXP20X
This driver can also be built as a module. If so, the module will be
called axp20x_battery.
+config AXP20X_POWER
+ tristate "AXP20x power supply driver"
+ depends on MFD_AXP20X
+ depends on IIO
+ help
+ This driver provides support for the power supply features of
+ AXP20x PMIC.
+
config AXP288_CHARGER
tristate "X-Powers AXP288 Charger"
depends on MFD_AXP20X && EXTCON_AXP288
@@ -553,11 +561,4 @@ config CHARGER_RT9455
help
Say Y to enable support for Richtek RT9455 battery charger.
-config AXP20X_POWER
- tristate "AXP20x power supply driver"
- depends on MFD_AXP20X
- help
- This driver provides support for the power supply features of
- AXP20x PMIC.
-
endif # POWER_SUPPLY