diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 965eafb6f8..f4b37989c8 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -8,9 +8,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/openwrt/mt76 PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2020-03-10 -PKG_SOURCE_VERSION:=a94e43f277e22ce24237320ce92b1f185eff0b1e -PKG_MIRROR_HASH:=b922f2143e5af9fd1e4f86002fefa91f42c8959385be6cda0633cce4f85a8d42 +PKG_SOURCE_DATE:=2020-04-27 +PKG_SOURCE_VERSION:=5f3ccc7226272198c21ec934d9072a56b0953f47 +PKG_MIRROR_HASH:=6f1a7b7d7b9f4db79d72405baeafa318769eeab270fea4479756f91ac5a2494d PKG_MAINTAINER:=Felix Fietkau PKG_BUILD_PARALLEL:=1 @@ -143,6 +143,7 @@ define KernelPackage/mt7615e TITLE:=MediaTek MT7615 wireless driver DEPENDS+=@PCI_SUPPORT +kmod-mt76-core FILES:=\ + $(PKG_BUILD_DIR)/mt7615/mt7615-common.ko \ $(PKG_BUILD_DIR)/mt7615/mt7615e.ko AUTOLOAD:=$(call AutoProbe,mt7615e) endef @@ -191,6 +192,7 @@ ifdef CONFIG_PACKAGE_kmod-mt7603 PKG_MAKE_FLAGS += CONFIG_MT7603E=m endif ifdef CONFIG_PACKAGE_kmod-mt7615e + PKG_MAKE_FLAGS += CONFIG_MT7615_COMMON=m PKG_MAKE_FLAGS += CONFIG_MT7615E=m ifdef CONFIG_TARGET_mediatek_mt7622 PKG_MAKE_FLAGS += CONFIG_MT7622_WMAC=y diff --git a/package/kernel/mt76/patches/0001-mt76-mt76x0-pci-add-mt7610-PCI-ID.patch b/package/kernel/mt76/patches/0001-mt76-mt76x0-pci-add-mt7610-PCI-ID.patch deleted file mode 100644 index a2aa0ec36d..0000000000 --- a/package/kernel/mt76/patches/0001-mt76-mt76x0-pci-add-mt7610-PCI-ID.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9b082c3fd3fc954937444220995cb05662ab2e82 Mon Sep 17 00:00:00 2001 -From: Pawel Dembicki -Date: Wed, 25 Mar 2020 06:51:29 +0100 -Subject: [PATCH] mt76: mt76x0: pci: add mt7610 PCI ID - -Add mt7610 PCI id found on D-Link DWR-960 to pci_device_id table. - -Run-tested on D-Link DWR-960 with no-name half-size mPCIE card -with mt7610e. - -Signed-off-by: Pawel Dembicki ---- - mt76x0/pci.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/mt76x0/pci.c b/mt76x0/pci.c -index e2974e0ae1fc..3bd753cda190 100644 ---- a/mt76x0/pci.c -+++ b/mt76x0/pci.c -@@ -215,6 +215,7 @@ mt76x0e_remove(struct pci_dev *pdev) - } - - static const struct pci_device_id mt76x0e_device_table[] = { -+ { PCI_DEVICE(0x14c3, 0x7610) }, - { PCI_DEVICE(0x14c3, 0x7630) }, - { PCI_DEVICE(0x14c3, 0x7650) }, - { }, --- -2.20.1 -