Merge "defconfig: sa415m and sa415m-perf: Disable bluetooth builtin" (94c741e6) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/configs/sa415m-perf_defconfig

+4 −2

Original line number	Diff line number	Diff line
		CONFIG_LOCALVERSION="-perf"
		CONFIG_AUDIT=y
		# CONFIG_AUDITSYSCALL is not set
		CONFIG_NO_HZ=y
		@@ -171,8 +172,6 @@ CONFIG_RMNET_DATA_FC=y
		CONFIG_RMNET_DATA_DEBUG_PKT=y
		CONFIG_CAN=y
		CONFIG_QTI_CAN=y
		CONFIG_BT=y
		CONFIG_MSM_BT_POWER=y
		CONFIG_CFG80211=y
		CONFIG_CFG80211_DEBUGFS=y
		CONFIG_CFG80211_INTERNAL_REGDB=y
		@@ -181,6 +180,8 @@ CONFIG_RFKILL=y
		CONFIG_IPC_ROUTER=y
		CONFIG_IPC_ROUTER_SECURITY=y
		CONFIG_IPC_ROUTER_NODE_ID=2
		CONFIG_DEVTMPFS=y
		CONFIG_DEVTMPFS_MOUNT=y
		CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y
		CONFIG_DMA_CMA=y
		CONFIG_CMA_SIZE_MBYTES=12
		@@ -256,6 +257,7 @@ CONFIG_I2C_MSM_V2=y
		CONFIG_SPI=y
		CONFIG_SPI_QUP=y
		CONFIG_SPI_SPIDEV=m
		CONFIG_SLIMBUS=y
		CONFIG_SPMI=y
		CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y
		CONFIG_PPS_CLIENT_GPIO=y

+3 −2

Original line number	Diff line number	Diff line
		@@ -172,8 +172,6 @@ CONFIG_RMNET_DATA_FC=y
		CONFIG_RMNET_DATA_DEBUG_PKT=y
		CONFIG_CAN=y
		CONFIG_QTI_CAN=y
		CONFIG_BT=y
		CONFIG_MSM_BT_POWER=y
		CONFIG_CFG80211=y
		CONFIG_CFG80211_DEBUGFS=y
		CONFIG_CFG80211_INTERNAL_REGDB=y
		@@ -182,6 +180,8 @@ CONFIG_RFKILL=y
		CONFIG_IPC_ROUTER=y
		CONFIG_IPC_ROUTER_SECURITY=y
		CONFIG_IPC_ROUTER_NODE_ID=2
		CONFIG_DEVTMPFS=y
		CONFIG_DEVTMPFS_MOUNT=y
		CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y
		CONFIG_DMA_CMA=y
		CONFIG_CMA_SIZE_MBYTES=12
		@@ -258,6 +258,7 @@ CONFIG_I2C_MSM_V2=y
		CONFIG_SPI=y
		CONFIG_SPI_QUP=y
		CONFIG_SPI_SPIDEV=m
		CONFIG_SLIMBUS=y
		CONFIG_SPMI=y
		CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y
		CONFIG_PPS_CLIENT_GPIO=y