]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branches 'wpcm450-for-v5.13', 'dt-for-v5.13' and 'lpc-for-v5.13' into for-next
authorJoel Stanley <joel@jms.id.au>
Fri, 9 Apr 2021 04:45:41 +0000 (14:15 +0930)
committerJoel Stanley <joel@jms.id.au>
Fri, 9 Apr 2021 04:45:41 +0000 (14:15 +0930)
1  2  3 
arch/arm/boot/dts/Makefile

index 5a9d99d5443e4b3e3966b86a2374e7a556908291,90aed2c2959a8e472399577d0fa2742d786ac3f9,8e5d4ab4e75e6e027309e6dd6583d7ea5ac25b86..f845238051e6fc0545b9f881feab1b979f876908
@@@@ -333,10 -333,9 -333,8 +333,11 @@@@ dtb-$(CONFIG_ARCH_LPC18XX) += 
   dtb-$(CONFIG_ARCH_LPC32XX) += \
        lpc3250-ea3250.dtb \
        lpc3250-phy3250.dtb
 ++dtb-$(CONFIG_ARCH_WPCM450) += \
 ++     nuvoton-wpcm450-supermicro-x9sci-ln4f.dtb
   dtb-$(CONFIG_ARCH_NPCM7XX) += \
        nuvoton-npcm730-gsj.dtb \
+ +     nuvoton-npcm730-gbs.dtb \
        nuvoton-npcm730-kudo.dtb \
        nuvoton-npcm750-evb.dtb \
        nuvoton-npcm750-runbmc-olympus.dtb