diff options
| author | Robert Marko | 2026-02-13 22:36:30 +0000 |
|---|---|---|
| committer | Robert Marko | 2026-02-13 22:36:30 +0000 |
| commit | b325e6e5eef626e8b5df41298a77f68815899b54 (patch) | |
| tree | e25734255cccbf9d3138603f2811551e8ce442dd | |
| parent | 0c98150650705ed5cf130c6258bca057a4fc36d4 (diff) | |
| download | openwrt-b325e6e5eef626e8b5df41298a77f68815899b54.tar.gz | |
ipq-wifi: fix botched rebase
I botched the rebase of ipq-wifi, so fix it.
Fixes: 67e6baf05e39 ("qualcommax: ipq60xx: add Netgear RBx350 support")
Signed-off-by: Robert Marko <robimarko@gmail.com>
| -rw-r--r-- | package/firmware/ipq-wifi/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index f5d74887f0..31ceed712e 100644 --- a/package/firmware/ipq-wifi/Makefile +++ b/package/firmware/ipq-wifi/Makefile @@ -259,11 +259,8 @@ $(eval $(call generate-ipq-wifi-package,netgear_lbr20,Netgear LBR20)) $(eval $(call generate-ipq-wifi-package,netgear_rax120v2,Netgear RAX120v2)) $(eval $(call generate-ipq-wifi-package,netgear_rbk20,Netgear RBK20)) $(eval $(call generate-ipq-wifi-package,netgear_rbk40,Netgear RBK40)) -<<<<<<< HEAD -$(eval $(call generate-ipq-wifi-package,netgear_rbk750,Netgear RBK750)) -======= $(eval $(call generate-ipq-wifi-package,netgear_rbk350,Netgear RBK350)) ->>>>>>> fb4c0dd54e (qualcommax: ipq60xx: add Netgear RBx350 support) +$(eval $(call generate-ipq-wifi-package,netgear_rbk750,Netgear RBK750)) $(eval $(call generate-ipq-wifi-package,netgear_sxk80,Netgear SXK80)) $(eval $(call generate-ipq-wifi-package,netgear_wax214,Netgear WAX214)) $(eval $(call generate-ipq-wifi-package,netgear_wax218,Netgear WAX218)) |