summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2026-07-01 13:39:15 +0100
committerMark Brown <broonie@kernel.org>2026-07-01 13:39:15 +0100
commitb86336fcb2d310cbddcc109e6d5c83d04e657a4a (patch)
tree823638ba5a0bbd2fe32073c59ee1bd8967bc63d6
parent00ef7b802fdce2ae44a84f49be89cd1504f4fa95 (diff)
parent11883fdc73a1c123f795be3cc0f512aee0c49d1e (diff)
downloadlinux-next-b86336fcb2d310cbddcc109e6d5c83d04e657a4a.tar.gz
linux-next-b86336fcb2d310cbddcc109e6d5c83d04e657a4a.zip
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git
-rw-r--r--arch/arm64/configs/defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 654a102cb5bc..f2e6ae93e533 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -193,6 +193,7 @@ CONFIG_BT_HCIUART_QCA=y
CONFIG_BT_HCIUART_MRVL=y
CONFIG_BT_MRVL=m
CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_MTKSDIO=m
CONFIG_BT_QCOMSMD=m
CONFIG_BT_NXPUART=m
CONFIG_CFG80211=m
@@ -515,6 +516,7 @@ CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_PCIE=m
CONFIG_MWIFIEX_USB=m
CONFIG_MT7921E=m
+CONFIG_MT7921S=m
CONFIG_RSI_91X=m
CONFIG_WL18XX=m
CONFIG_WLCORE_SDIO=m