diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-16 02:04:26 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-16 02:04:26 +0300 |
| commit | 8ea1c981b6303904a2d92102f903843bda9df58c (patch) | |
| tree | 9cef253e8f5d6b4279eb867f58a1defb81d7b193 /arch/arm/boot/dts/Makefile | |
| parent | ee5d89239500de9eff188c26375c3512d8ac7f6f (diff) | |
| parent | acde758b31f33d1599a07930b8c0ea082157cf70 (diff) | |
| download | linux-8ea1c981b6303904a2d92102f903843bda9df58c.tar.xz | |
Merge tag 'realview-base-armsoc-2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/dt
Merge "Realview DT files" from Linus Walleij:
The device tree changes for the continued RealView DT
support.
* tag 'realview-base-armsoc-2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: realview: add device tree for PB11MPCore
clk: add ARM syscon ICST device tree bindings
ARM: add DT bindings for the ARM11MPCore CPU cluster
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index d6bdf1ff12f1..ceb3c559b78a 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -519,7 +519,8 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-msm8960-cdp.dtb \ qcom-msm8974-sony-xperia-honami.dtb dtb-$(CONFIG_ARCH_REALVIEW) += \ - arm-realview-pb1176.dtb + arm-realview-pb1176.dtb \ + arm-realview-pb11mp.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3036-evb.dtb \ rk3066a-bqcurie2.dtb \ |