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

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

Merge "defconfig: msmtitanium: Enable nqx nfc kernel driver"

parents 67b69a26 91c335d7

arch/arm/configs/msmcortex-perf_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -214,6 +214,7 @@ CONFIG_MSM_BT_POWER=y 
CONFIG_CFG80211=y

CONFIG_CFG80211=y

CONFIG_CFG80211_INTERNAL_REGDB=y

CONFIG_CFG80211_INTERNAL_REGDB=y

CONFIG_RFKILL=y

CONFIG_RFKILL=y

CONFIG_NFC_NQ=y

CONFIG_IPC_ROUTER=y

CONFIG_IPC_ROUTER=y

CONFIG_IPC_ROUTER_SECURITY=y

CONFIG_IPC_ROUTER_SECURITY=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

arch/arm/configs/msmcortex_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -211,6 +211,7 @@ CONFIG_CFG80211=y 
CONFIG_NL80211_TESTMODE=y

CONFIG_NL80211_TESTMODE=y

CONFIG_CFG80211_INTERNAL_REGDB=y

CONFIG_CFG80211_INTERNAL_REGDB=y

CONFIG_RFKILL=y

CONFIG_RFKILL=y

CONFIG_NFC_NQ=y

CONFIG_IPC_ROUTER=y

CONFIG_IPC_ROUTER=y

CONFIG_IPC_ROUTER_SECURITY=y

CONFIG_IPC_ROUTER_SECURITY=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

arch/arm64/configs/msmcortex-perf_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -213,6 +213,7 @@ CONFIG_MSM_BT_POWER=y 
CONFIG_CFG80211=y

CONFIG_CFG80211=y

CONFIG_CFG80211_INTERNAL_REGDB=y

CONFIG_CFG80211_INTERNAL_REGDB=y

CONFIG_RFKILL=y

CONFIG_RFKILL=y

CONFIG_NFC_NQ=y

CONFIG_IPC_ROUTER=y

CONFIG_IPC_ROUTER=y

CONFIG_IPC_ROUTER_SECURITY=y

CONFIG_IPC_ROUTER_SECURITY=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

arch/arm64/configs/msmcortex_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -213,6 +213,7 @@ CONFIG_MSM_BT_POWER=y 
CONFIG_CFG80211=y

CONFIG_CFG80211=y

CONFIG_CFG80211_INTERNAL_REGDB=y

CONFIG_CFG80211_INTERNAL_REGDB=y

CONFIG_RFKILL=y

CONFIG_RFKILL=y

CONFIG_NFC_NQ=y

CONFIG_IPC_ROUTER=y

CONFIG_IPC_ROUTER=y

CONFIG_IPC_ROUTER_SECURITY=y

CONFIG_IPC_ROUTER_SECURITY=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y