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

Commit 2e1f9cbe authored Dec 16, 2015 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Dec 16, 2015

Merge "arch: defconfig: enable pronto wlan module for msm8953"

parents ce507ce6 1e057129

arch/arm/configs/mdm-perf_defconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -201,7 +201,8 @@ CONFIG_RNDIS_IPA=y
		CONFIG_PPP=y
		CONFIG_PPP_ASYNC=y
		CONFIG_WCNSS_MEM_PRE_ALLOC=y
		CONFIG_CNSS=y
		CONFIG_CNSS_CRYPTO=y
		CONFIG_CNSS_PCI=y
		CONFIG_CLD_LL_CORE=y
		# CONFIG_INPUT_MOUSEDEV is not set
		CONFIG_INPUT_EVDEV=y

arch/arm/configs/mdm9607-perf_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -193,6 +193,7 @@ CONFIG_QCOM_EMAC=m
		CONFIG_PPP=y
		CONFIG_PPP_ASYNC=y
		CONFIG_WCNSS_MEM_PRE_ALLOC=y
		CONFIG_CNSS_CRYPTO=y
		CONFIG_CNSS_SDIO=y
		CONFIG_CLD_HL_SDIO_CORE=y
		# CONFIG_INPUT_MOUSEDEV is not set

arch/arm/configs/mdm9607_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -193,6 +193,7 @@ CONFIG_QCOM_EMAC=m
		CONFIG_PPP=y
		CONFIG_PPP_ASYNC=y
		CONFIG_WCNSS_MEM_PRE_ALLOC=y
		CONFIG_CNSS_CRYPTO=y
		CONFIG_CNSS_SDIO=y
		CONFIG_CLD_HL_SDIO_CORE=y
		# CONFIG_INPUT_MOUSEDEV is not set

arch/arm/configs/mdm_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -201,6 +201,7 @@ CONFIG_RNDIS_IPA=y
		CONFIG_PPP=y
		CONFIG_PPP_ASYNC=y
		CONFIG_WCNSS_MEM_PRE_ALLOC=y
		CONFIG_CNSS_CRYPTO=y
		CONFIG_CNSS_PCI=y
		CONFIG_CLD_LL_CORE=y
		# CONFIG_INPUT_MOUSEDEV is not set

arch/arm/configs/msm8937-perf_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -265,6 +265,7 @@ CONFIG_WCNSS_CORE=y
		CONFIG_WCNSS_CORE_PRONTO=y
		CONFIG_WCNSS_REGISTER_DUMP_ON_BITE=y
		CONFIG_WCNSS_MEM_PRE_ALLOC=y
		CONFIG_CNSS_CRYPTO=y
		CONFIG_ATH_CARDS=y
		CONFIG_CLD_LL_CORE=y
		CONFIG_INPUT_EVDEV=y