From 7298db5a9af6bbb33297577da2b71bd4acf292b0 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 4 Aug 2023 02:03:35 +0800 Subject: [PATCH] mediatek: fix merge conflict Fixes: #1027 Signed-off-by: Tianling Shen --- .../mediatek/filogic/base-files/etc/board.d/02_network | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network index 5ecd69d3dd..4d89bc41f2 100644 --- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network +++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network @@ -52,13 +52,10 @@ mediatek_setup_interfaces() tplink,tl-xdr6086) ucidef_set_interfaces_lan_wan "lan1 lan2" eth1 ;; -<<<<<<< HEAD - xiaomi,redmi-router-ax6000|\ -======= xiaomi,mi-router-wr30u-112m-nmbm|\ xiaomi,mi-router-wr30u-stock|\ xiaomi,mi-router-wr30u-ubootmod|\ ->>>>>>> op-of/master + xiaomi,redmi-router-ax6000|\ xiaomi,redmi-router-ax6000-stock|\ xiaomi,redmi-router-ax6000-ubootmod) ucidef_set_interfaces_lan_wan "lan2 lan3 lan4" wan @@ -104,13 +101,10 @@ mediatek_setup_macs() wan_mac=$(macaddr_add "$lan_mac" 1) label_mac=$wan_mac ;; -<<<<<<< HEAD - xiaomi,redmi-router-ax6000|\ -======= xiaomi,mi-router-wr30u-112m-nmbm|\ xiaomi,mi-router-wr30u-stock|\ xiaomi,mi-router-wr30u-ubootmod|\ ->>>>>>> op-of/master + xiaomi,redmi-router-ax6000|\ xiaomi,redmi-router-ax6000-stock|\ xiaomi,redmi-router-ax6000-ubootmod) wan_mac=$(mtd_get_mac_ascii Bdata ethaddr_wan)