Skip to content

Commit b325e6e

Browse files
committed
ipq-wifi: fix botched rebase
I botched the rebase of ipq-wifi, so fix it. Fixes: 67e6baf ("qualcommax: ipq60xx: add Netgear RBx350 support") Signed-off-by: Robert Marko <robimarko@gmail.com>
1 parent 0c98150 commit b325e6e

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

package/firmware/ipq-wifi/Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,8 @@ $(eval $(call generate-ipq-wifi-package,netgear_lbr20,Netgear LBR20))
259259
$(eval $(call generate-ipq-wifi-package,netgear_rax120v2,Netgear RAX120v2))
260260
$(eval $(call generate-ipq-wifi-package,netgear_rbk20,Netgear RBK20))
261261
$(eval $(call generate-ipq-wifi-package,netgear_rbk40,Netgear RBK40))
262-
<<<<<<< HEAD
263-
$(eval $(call generate-ipq-wifi-package,netgear_rbk750,Netgear RBK750))
264-
=======
265262
$(eval $(call generate-ipq-wifi-package,netgear_rbk350,Netgear RBK350))
266-
>>>>>>> fb4c0dd54e (qualcommax: ipq60xx: add Netgear RBx350 support)
263+
$(eval $(call generate-ipq-wifi-package,netgear_rbk750,Netgear RBK750))
267264
$(eval $(call generate-ipq-wifi-package,netgear_sxk80,Netgear SXK80))
268265
$(eval $(call generate-ipq-wifi-package,netgear_wax214,Netgear WAX214))
269266
$(eval $(call generate-ipq-wifi-package,netgear_wax218,Netgear WAX218))

0 commit comments

Comments
 (0)