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

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

Merge "defconfig: msmcortex: Enable ICNSS platform driver"

parents d6796b52 1ee42790

arch/arm64/configs/msmcortex-perf_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -269,9 +269,7 @@ CONFIG_WCNSS_MEM_PRE_ALLOC=y 
CONFIG_CNSS_CRYPTO=y

CONFIG_ATH_CARDS=y

CONFIG_WIL6210=m

CONFIG_CNSS_PCI=y

CONFIG_CLD_LL_CORE=y

CONFIG_BUS_AUTO_SUSPEND=y

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_EVBUG=m

CONFIG_INPUT_KEYRESET=y
@@ -546,6 +544,7 @@ CONFIG_MSM_SUBSYSTEM_RESTART=y 
CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_ICNSS=y

CONFIG_MSM_CORE_CTL_HELPER=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_PERFORMANCE=y

arch/arm64/configs/msmcortex_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -269,9 +269,7 @@ CONFIG_WCNSS_MEM_PRE_ALLOC=y 
CONFIG_CNSS_CRYPTO=y

CONFIG_ATH_CARDS=y

CONFIG_WIL6210=m

CONFIG_CNSS_PCI=y

CONFIG_CLD_LL_CORE=y

CONFIG_BUS_AUTO_SUSPEND=y

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_EVBUG=m

CONFIG_INPUT_KEYRESET=y
@@ -562,6 +560,7 @@ CONFIG_MSM_PIL=y 
CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_TRACER_PKT=y

CONFIG_ICNSS=y

CONFIG_MSM_CORE_CTL_HELPER=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_MSM_PERFORMANCE=y