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

Commit de86f830 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: enable bluetooth and slimbus driver" into msm-4.8

parents a62141d9 3fc440c3

arch/arm64/configs/msmskunk-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ CONFIG_NET_ACT_SKBEDIT=y 
CONFIG_RMNET_DATA=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
@@ -253,7 +254,6 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=y

CONFIG_SLIMBUS=y

CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_SPMI=y

CONFIG_PINCTRL_MSMSKUNK=y

arch/arm64/configs/msmskunk_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ CONFIG_DNS_RESOLVER=y 
CONFIG_RMNET_DATA=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
@@ -260,7 +261,6 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=y

CONFIG_SLIMBUS=y

CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_SPMI=y

CONFIG_PINCTRL_MSMSKUNK=y