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

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

Merge "defconfig: arm64: sdm845: Enable NFC driver" into msm-4.9

parents bc7c2d62 4762d322

arch/arm64/configs/sdm845-perf_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -222,6 +222,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/sdm845_defconfig

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

CONFIG_CFG80211_INTERNAL_REGDB=y

# CONFIG_CFG80211_CRDA_SUPPORT is not set

# CONFIG_CFG80211_CRDA_SUPPORT is not set

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