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

Commit 442016f9 authored May 08, 2017 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server May 08, 2017

Merge "defconfig: Enable CONFIG_SMB1355_SLAVE_CHARGER for sdm845" into msm-4.9

parents 9da963f7 26aefdd5

arch/arm64/configs/sdm845-perf_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -300,8 +300,8 @@ CONFIG_QCOM_DLOAD_MODE=y
		CONFIG_POWER_RESET_XGENE=y
		CONFIG_POWER_RESET_SYSCON=y
		CONFIG_QPNP_FG_GEN3=y
		CONFIG_SMB1355_SLAVE_CHARGER=y
		CONFIG_QPNP_SMB2=y
		CONFIG_SMB138X_CHARGER=y
		CONFIG_QPNP_QNOVO=y
		CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y
		CONFIG_THERMAL=y

arch/arm64/configs/sdm845_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -309,8 +309,8 @@ CONFIG_QCOM_DLOAD_MODE=y
		CONFIG_POWER_RESET_XGENE=y
		CONFIG_POWER_RESET_SYSCON=y
		CONFIG_QPNP_FG_GEN3=y
		CONFIG_SMB1355_SLAVE_CHARGER=y
		CONFIG_QPNP_SMB2=y
		CONFIG_SMB138X_CHARGER=y
		CONFIG_QPNP_QNOVO=y
		CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y
		CONFIG_THERMAL=y