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

Commit 41734aef authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: power: Reorganize batterydata-lib.c"

parents ea9fc4a3 c7e0de5a

arch/arm/mach-msm/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ obj-$(CONFIG_ARCH_FSM9900) += clock-krait-8974.o 
obj-$(CONFIG_ARCH_FSM9900) += rfic-fsm9900.o bbif-fsm9900.o

obj-$(CONFIG_MSM_WATCHDOG_V2) += msm_watchdog_v2.o

obj-$(CONFIG_MSM_MEMORY_DUMP) += msm_memory_dump.o

obj-$(CONFIG_PM8921_BMS) += bms-batterydata.o bms-batterydata-desay.o batterydata-lib.o

obj-$(CONFIG_QPNP_BMS) += bms-batterydata.o bms-batterydata-desay.o batterydata-lib.o

obj-$(CONFIG_QPNP_BMS) += bms-batterydata.o bms-batterydata-desay.o

obj-$(CONFIG_QPNP_BMS) += bms-batterydata-oem.o bms-batterydata-qrd-4v35-2000mah.o bms-batterydata-qrd-4v2-1300mah.o

obj-$(CONFIG_ARCH_APQ8084) += board-8084.o board-8084-gpiomux.o

obj-$(CONFIG_ARCH_APQ8084) += clock-local2.o clock-pll.o clock-8084.o clock-rpm.o clock-voter.o clock-mdss-8974.o

drivers/power/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ obj-$(CONFIG_SMB350_CHARGER) += smb350_charger.o 
obj-$(CONFIG_SMB135X_CHARGER)   += smb135x-charger.o

obj-$(CONFIG_BATTERY_BQ28400)	+= bq28400_battery.o

obj-$(CONFIG_SMB137C_CHARGER)	+= smb137c-charger.o

obj-$(CONFIG_QPNP_BMS)		+= qpnp-bms.o

obj-$(CONFIG_QPNP_BMS)		+= qpnp-bms.o batterydata-lib.o

obj-$(CONFIG_QPNP_CHARGER)	+= qpnp-charger.o

obj-$(CONFIG_CHARGER_SMB347)	+= smb347-charger.o

obj-$(CONFIG_CHARGER_TPS65090)	+= tps65090-charger.o