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

Commit 31b6ca6e authored Feb 28, 2018 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Feb 28, 2018

Merge "ARM: dts: msm: Enable Bluetooth module"

parents c649db6f 4f28e587

arch/arm64/configs/sdm855-perf_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -212,6 +212,7 @@ CONFIG_RMNET_DATA=y
		CONFIG_RMNET_DATA_FC=y
		CONFIG_RMNET_DATA_DEBUG_PKT=y
		CONFIG_BT=y
		CONFIG_MSM_BT_POWER=y
		CONFIG_CFG80211=y
		CONFIG_CFG80211_INTERNAL_REGDB=y
		CONFIG_RFKILL=y
		@@ -281,7 +282,6 @@ CONFIG_SPMI_SIMULATOR=y
		CONFIG_PM855_PMIC_SIMULATOR=y
		CONFIG_PM855B_PMIC_SIMULATOR=y
		CONFIG_PM855L_PMIC_SIMULATOR=y
		CONFIG_SLIMBUS=y
		CONFIG_SLIMBUS_MSM_NGD=y
		CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
		CONFIG_PINCTRL_SDM855=y

arch/arm64/configs/sdm855_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -219,6 +219,7 @@ CONFIG_RMNET_DATA=y
		CONFIG_RMNET_DATA_FC=y
		CONFIG_RMNET_DATA_DEBUG_PKT=y
		CONFIG_BT=y
		CONFIG_MSM_BT_POWER=y
		CONFIG_CFG80211=y
		CONFIG_CFG80211_INTERNAL_REGDB=y
		# CONFIG_CFG80211_CRDA_SUPPORT is not set
		@@ -290,7 +291,6 @@ CONFIG_SPMI_SIMULATOR=y
		CONFIG_PM855_PMIC_SIMULATOR=y
		CONFIG_PM855B_PMIC_SIMULATOR=y
		CONFIG_PM855L_PMIC_SIMULATOR=y
		CONFIG_SLIMBUS=y
		CONFIG_SLIMBUS_MSM_NGD=y
		CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
		CONFIG_PINCTRL_SDM855=y