Index: src/drivers/net/wireless/mediatek/mt76/mt7921/Makefile
===================================================================
--- src.orig/drivers/net/wireless/mediatek/mt76/mt7921/Makefile	2022-01-30 05:38:12.755480439 +0100
+++ src/drivers/net/wireless/mediatek/mt76/mt7921/Makefile	2022-01-30 05:39:05.150986998 +0100
@@ -1,5 +1,7 @@
 #SPDX-License-Identifier: ISC
 
+CONFIG_MT7921E := m
+
 obj-$(CONFIG_MT7921E) += mt7921e.o
 
 CFLAGS_trace.o := -I$(src)
Index: src/drivers/net/wireless/mediatek/mt76/Makefile
===================================================================
--- src.orig/drivers/net/wireless/mediatek/mt76/Makefile	2022-01-30 05:38:12.755480439 +0100
+++ src/drivers/net/wireless/mediatek/mt76/Makefile	2022-01-30 05:41:43.749493377 +0100
@@ -1,9 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0-only
+CONFIG_MT76_CONNAC_LIB := m
+CONFIG_MT7921E := m
+
 obj-$(CONFIG_MT76_CORE) += mt76.o
-obj-$(CONFIG_MT76_USB) += mt76-usb.o
-obj-$(CONFIG_MT76_SDIO) += mt76-sdio.o
-obj-$(CONFIG_MT76x02_LIB) += mt76x02-lib.o
-obj-$(CONFIG_MT76x02_USB) += mt76x02-usb.o
 obj-$(CONFIG_MT76_CONNAC_LIB) += mt76-connac-lib.o
 
 mt76-y := \
@@ -13,25 +12,8 @@
 mt76-$(CONFIG_PCI) += pci.o
 mt76-$(CONFIG_NL80211_TESTMODE) += testmode.o
 
-mt76-usb-y := usb.o usb_trace.o
-mt76-sdio-y := sdio.o
-
 CFLAGS_trace.o := -I$(src)
-CFLAGS_usb_trace.o := -I$(src)
-CFLAGS_mt76x02_trace.o := -I$(src)
-
-mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o \
-		 mt76x02_eeprom.o mt76x02_phy.o mt76x02_mmio.o \
-		 mt76x02_txrx.o mt76x02_trace.o mt76x02_debugfs.o \
-		 mt76x02_dfs.o mt76x02_beacon.o
-
-mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o
 
 mt76-connac-lib-y := mt76_connac_mcu.o mt76_connac_mac.o
 
-obj-$(CONFIG_MT76x0_COMMON) += mt76x0/
-obj-$(CONFIG_MT76x2_COMMON) += mt76x2/
-obj-$(CONFIG_MT7603E) += mt7603/
-obj-$(CONFIG_MT7615_COMMON) += mt7615/
-obj-$(CONFIG_MT7915E) += mt7915/
 obj-$(CONFIG_MT7921E) += mt7921/