diff options
| author | Sebastian Reichel <sebastian.reichel@collabora.co.uk> | 2017-07-25 15:18:27 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.co.uk> | 2017-07-25 15:18:27 +0200 |
| commit | c8143b72888c551bc4119f52d818343945f969d4 (patch) | |
| tree | 3248876df339288a05fdafa8b5e78d8a3295bb01 /drivers/power/supply/Makefile | |
| parent | 17825ff6ec6db23892e61a1496abf7d737afe9e7 (diff) | |
| parent | 55a9db679183bcf85a6e5c44a4f92f158bb6f03d (diff) | |
Merge branch 'psy-w1-for-v4.14-immutable' into for-next
Merge immutable branch moving bq27000 driver from w1 subsystem
into power-supply subsystem.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Diffstat (limited to 'drivers/power/supply/Makefile')
| -rw-r--r-- | drivers/power/supply/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile index 509131673355..621a19058fec 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -38,6 +38,7 @@ obj-$(CONFIG_BATTERY_SBS) += sbs-battery.o obj-$(CONFIG_CHARGER_SBS) += sbs-charger.o obj-$(CONFIG_BATTERY_BQ27XXX) += bq27xxx_battery.o obj-$(CONFIG_BATTERY_BQ27XXX_I2C) += bq27xxx_battery_i2c.o +obj-$(CONFIG_BATTERY_BQ27XXX_HDQ) += bq27xxx_battery_hdq.o obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o obj-$(CONFIG_BATTERY_DA9052) += da9052-battery.o obj-$(CONFIG_CHARGER_DA9150) += da9150-charger.o |