From: Robert Marko Date: Fri, 13 Feb 2026 22:36:30 +0000 (+0100) Subject: ipq-wifi: fix botched rebase X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b325e6e5eef626e8b5df41298a77f68815899b54;p=thirdparty%2Fopenwrt.git 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 --- diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index f5d74887f08..31ceed712e6 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))