diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2014-02-28 16:10:19 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-02-28 16:10:19 +0100 |
| commit | 428956428621af8dc74d2e2f767d9588ce1ce7f0 (patch) | |
| tree | 64cee80f4e07f9f50a13bcd1b5c736946673de3a /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'mvebu-dt-3.15-2' of git://git.infradead.org/linux-mvebu into next/dt (diff) | |
| parent | ARM: qcom: Rename various msm prefixed functions to qcom (diff) | |
| download | linux-dev-428956428621af8dc74d2e2f767d9588ce1ce7f0.tar.xz linux-dev-428956428621af8dc74d2e2f767d9588ce1ce7f0.zip | |
Merge branch 'qcom/cleanup' into next/dt
This is a dependency for the qcom/dt branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 94b3bb4a08ea..ec2340238436 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -125,9 +125,6 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-b3.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 \ @@ -265,6 +262,9 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ dra7-evm.dtb dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb +dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660-surf.dtb \ + qcom-msm8960-cdp.dtb \ + qcom-apq8074-dragonboard.dtb dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ ste-hrefprev60-stuib.dtb \ ste-hrefprev60-tvk.dtb \ |