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

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

Merge "defconfig: Enable QCA SDIO config flags for Dual-WiFi"

parents cf067b80 9cc048b3

arch/arm/configs/mdm-perf_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -207,7 +207,8 @@ CONFIG_USB_NET_SMSC95XX=y 
CONFIG_USBNET_IPA_BRIDGE=y

CONFIG_WCNSS_MEM_PRE_ALLOC=y

CONFIG_CNSS_CRYPTO=y

CONFIG_CNSS_PCI=y

CONFIG_CNSS=y

CONFIG_CLD_HL_SDIO_CORE=y

CONFIG_CLD_LL_CORE=y

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y
@@ -307,7 +308,6 @@ CONFIG_ANDROID=y 
CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_MSM_BUS_SCALING=y

CONFIG_MSM_BUSPM_DEV=m

CONFIG_BUS_TOPOLOGY_ADHOC=y

CONFIG_QPNP_POWER_ON=y

CONFIG_QPNP_REVID=y

arch/arm/configs/mdm9607-perf_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ CONFIG_PPP=y 
CONFIG_PPP_ASYNC=y

CONFIG_WCNSS_MEM_PRE_ALLOC=y

CONFIG_CNSS_CRYPTO=y

CONFIG_CNSS_SDIO=y

CONFIG_CNSS=y

CONFIG_CLD_HL_SDIO_CORE=y

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y
@@ -289,7 +289,6 @@ CONFIG_ANDROID=y 
CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_MSM_BUS_SCALING=y

CONFIG_MSM_BUSPM_DEV=m

CONFIG_BUS_TOPOLOGY_ADHOC=y

CONFIG_QPNP_POWER_ON=y

CONFIG_QPNP_REVID=y

arch/arm/configs/mdm9607_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ CONFIG_PPP=y 
CONFIG_PPP_ASYNC=y

CONFIG_WCNSS_MEM_PRE_ALLOC=y

CONFIG_CNSS_CRYPTO=y

CONFIG_CNSS_SDIO=y

CONFIG_CNSS=y

CONFIG_CLD_HL_SDIO_CORE=y

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y
@@ -290,7 +290,6 @@ CONFIG_ANDROID=y 
CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_MSM_BUS_SCALING=y

CONFIG_MSM_BUSPM_DEV=m

CONFIG_BUS_TOPOLOGY_ADHOC=y

CONFIG_QPNP_POWER_ON=y

CONFIG_QPNP_REVID=y

arch/arm/configs/mdm_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -206,7 +206,8 @@ CONFIG_USB_NET_SMSC95XX=y 
CONFIG_USBNET_IPA_BRIDGE=y

CONFIG_WCNSS_MEM_PRE_ALLOC=y

CONFIG_CNSS_CRYPTO=y

CONFIG_CNSS_PCI=y

CONFIG_CNSS=y

CONFIG_CLD_HL_SDIO_CORE=y

CONFIG_CLD_LL_CORE=y

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y
@@ -319,7 +320,6 @@ CONFIG_SW_SYNC=y 
CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_MSM_BUS_SCALING=y

CONFIG_MSM_BUSPM_DEV=m

CONFIG_BUS_TOPOLOGY_ADHOC=y

CONFIG_QPNP_POWER_ON=y

CONFIG_QPNP_REVID=y

arch/arm64/configs/msm-auto-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ CONFIG_WCNSS_MEM_PRE_ALLOC=y 
CONFIG_CNSS_CRYPTO=y

CONFIG_ATH_CARDS=y

CONFIG_WIL6210=m

CONFIG_CNSS_PCI=y

CONFIG_CNSS=y

CONFIG_CLD_LL_CORE=y

CONFIG_BUS_AUTO_SUSPEND=y

CONFIG_INPUT_EVDEV=y