Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcm53xx: fix merge conflict

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2023-10-28 16:29:35 +08:00
parent 95e80a87ec
commit 7bfadda62c
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/bcm53xx/image/Makefile
View File

@@ -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