From: Arnd Bergmann Date: Fri, 28 Feb 2014 15:10:19 +0000 (+0100) Subject: Merge branch 'qcom/cleanup' into next/dt X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=428956428621af8dc74d2e2f767d9588ce1ce7f0;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'qcom/cleanup' into next/dt This is a dependency for the qcom/dt branch. Signed-off-by: Arnd Bergmann --- 428956428621af8dc74d2e2f767d9588ce1ce7f0 diff --cc arch/arm/boot/dts/Makefile index 94b3bb4a08ea,c9eaf1f87041..ec2340238436 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@@ -120,14 -115,9 +120,11 @@@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood kirkwood-sheevaplug-esata.dtb \ kirkwood-topkick.dtb \ kirkwood-ts219-6281.dtb \ - kirkwood-ts219-6282.dtb + kirkwood-ts219-6282.dtb \ + kirkwood-ts419-6281.dtb \ + kirkwood-ts419-6282.dtb dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb - dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \ - qcom-msm8960-cdp.dtb \ - qcom-apq8074-dragonboard.dtb dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ armada-370-mirabox.dtb \ armada-370-netgear-rn102.dtb \