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

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

Merge "defconfig: msmkrypton: Enable QCACLD"

parents dd7149ea 513fafee

arch/arm/configs/msmkrypton_defconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -70,7 +70,7 @@ CONFIG_PACKET=y 
CONFIG_UNIX=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_INET=y

CONFIG_IPV6=y

CONFIG_IPV6=y

# CONFIG_WIRELESS is not set

CONFIG_CFG80211=y

CONFIG_MTD=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_BLOCK=y
@@ -99,7 +99,7 @@ CONFIG_KS8851=y 
# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_WLAN is not set

CONFIG_CLD_LL_CORE=y

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_KEYBOARD is not set

drivers/net/wireless/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -321,7 +321,7 @@ config WCNSS_REGISTER_DUMP_ON_BITE 
	 register dump on WCNSS WDOG bite.

	 register dump on WCNSS WDOG bite.





config CLD_LL_CORE

config CLD_LL_CORE

	tristate "Qualcomm CORE driver for QCA6714"

	tristate "Qualcomm CORE driver for QCA6174"

	select WIRELESS_EXT

	select WIRELESS_EXT

	select WEXT_PRIV

	select WEXT_PRIV

	select WEXT_CORE

	select WEXT_CORE
@@ -332,7 +332,7 @@ config CLD_LL_CORE 
	depends on PCI_MSI

	depends on PCI_MSI

	depends on MSM_PCIE

	depends on MSM_PCIE

	---help---

	---help---

	  Core driver for the Qualcomm QCA6714 Chipset

	  Core driver for the Qualcomm QCA6174 Chipset





source "drivers/net/wireless/ath/Kconfig"

source "drivers/net/wireless/ath/Kconfig"

source "drivers/net/wireless/b43/Kconfig"

source "drivers/net/wireless/b43/Kconfig"