From 0f52375dc9c3cc9c2a81dc8dbfb42791ff2b799a Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Tue, 12 May 2026 16:22:33 -0700 Subject: [PATCH] Revert "ANDROID: GKI: DB845C: cfg/mac 80211 as vendor modules" This reverts commit 12bd29ac6aab15e0b38f1237b4508d42c8989767 which pulls them in via GKI now. Bug: 505327866 Change-Id: I546a584acd7036a53f72a6cd6bc32d1e20587873 Signed-off-by: Will McVicker --- BUILD.bazel | 2 -- arch/arm64/configs/db845c_gki.fragment | 6 ------ 2 files changed, 8 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 6278d81c69d5..f4d0ae520b75 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -748,12 +748,10 @@ _DB845C_MODULE_OUTS = [ "drivers/usb/typec/mux/wcd939x-usbss.ko", "drivers/usb/typec/tcpm/qcom/qcom_pmic_tcpm.ko", "drivers/usb/typec/ucsi/ucsi_glink.ko", - "net/mac80211/mac80211.ko", "net/qrtr/qrtr.ko", "net/qrtr/qrtr-mhi.ko", "net/qrtr/qrtr-smd.ko", "net/qrtr/qrtr-tun.ko", - "net/wireless/cfg80211.ko", "sound/soc/codecs/snd-soc-dmic.ko", "sound/soc/codecs/snd-soc-hdmi-codec.ko", "sound/soc/codecs/snd-soc-lpass-macro-common.ko", diff --git a/arch/arm64/configs/db845c_gki.fragment b/arch/arm64/configs/db845c_gki.fragment index 092da33fe903..ea074ba82ce3 100644 --- a/arch/arm64/configs/db845c_gki.fragment +++ b/arch/arm64/configs/db845c_gki.fragment @@ -342,12 +342,6 @@ CONFIG_PINCTRL_SM8650_LPASS_LPI=m CONFIG_SM_GCC_8650=m CONFIG_SM_GPUCC_8650=m CONFIG_SM_TCSRCC_8650=m -# CFG80211 & MAC80211 as modules -CONFIG_CFG80211=m -CONFIG_NL80211_TESTMODE=y -CONFIG_CFG80211_CERTIFICATION_ONUS=y -CONFIG_CFG80211_REG_CELLULAR_HINTS=y -CONFIG_MAC80211=m # PWRSEQ driver for WCN BT-WLAN chipsets on sm8250 and newer SoCs # Depends on CONFIG_POWER_SEQUENCING in gki_defconfig CONFIG_POWER_SEQUENCING_QCOM_WCN=m