From 7bfadda62c7f00ded339db1bbcfdae511be7385f Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 28 Oct 2023 16:29:35 +0800 Subject: [PATCH] bcm53xx: fix merge conflict Signed-off-by: Tianling Shen --- target/linux/bcm53xx/image/Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/target/linux/bcm53xx/image/Makefile b/target/linux/bcm53xx/image/Makefile index f3c7622c26..8c1addc797 100644 --- a/target/linux/bcm53xx/image/Makefile +++ b/target/linux/bcm53xx/image/Makefile @@ -470,16 +470,12 @@ TARGET_DEVICES += smartrg_sr400ac define Device/phicomm_k3 DEVICE_VENDOR := PHICOMM DEVICE_MODEL := K3 -<<<<<<< HEAD - DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES) \ - -brcmfmac-firmware-4366c0-pcie brcmfmac-firmware-4366c0-pcie-k3 -======= DEVICE_ALT0_VENDOR := Wavlink DEVICE_ALT0_MODEL := QUANTUM DAX DEVICE_ALT1_VENDOR := Wavlink DEVICE_ALT1_MODEL := WL-WN538A8 - DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES) ->>>>>>> op-of/openwrt-23.05 + DEVICE_PACKAGES := $(BRCMFMAC_4366C0) $(USB3_PACKAGES) \ + -brcmfmac-firmware-4366c0-pcie brcmfmac-firmware-4366c0-pcie-k3 IMAGES := trx endef TARGET_DEVICES += phicomm_k3