| commit | 926f916d69041ddcb9c30a593e34925035691123 | [log] [tgz] |
|---|---|---|
| author | developer <developer@mediatek.com> | Tue Jul 05 10:55:37 2022 +0800 |
| committer | developer <developer@mediatek.com> | Tue Jul 05 11:09:08 2022 +0800 |
| tree | e7393718707a93fb8f2243866733d1451b2b69d9 | |
| parent | b7c46752142fd0b8b1a211a3b2d70bf1c2a33a53 [diff] |
[][MAC80211][WED][Fix patch conflicts] [Description] Fix patch conficts. [Release-log] N/A Change-Id: Ib4951d7645e964baa092fad969d33d3dabb4dea8 Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6203470
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9993-add-wed.patch b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9993-add-wed.patch index 06b0bcb..42a9077 100755 --- a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9993-add-wed.patch +++ b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9993-add-wed.patch
@@ -146,10 +146,11 @@ #include <linux/mfd/syscon.h> #include <linux/regmap.h> #include <linux/clk.h> -@@ -19,12 +20,14 @@ +@@ -19,13 +20,15 @@ #include <linux/interrupt.h> #include <linux/pinctrl/devinfo.h> #include <linux/phylink.h> + #include <linux/gpio/consumer.h> +#include <linux/bitfield.h> #include <net/dsa.h>