diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-26 13:41:51 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-26 13:41:51 +0200 |
| commit | 6945248f34b95330700f3d2632608457abaddb18 (patch) | |
| tree | f5725a60e53659d3fecab9d1ae72b1e8ea7682ef /arch/arm/boot/dts/Makefile | |
| parent | 1fb75865d8b80b216a6f540b32f6cd1480f8c843 (diff) | |
| parent | 0767a5cb425374aafa89d33d6b1190a01d7f6b0e (diff) | |
| download | linux-next-6945248f34b95330700f3d2632608457abaddb18.tar.gz | |
Merge tag 'ox810se-arm-dt-v4.6-rc3' of https://github.com/superna9999/linux into next/dt
Merge "ARM: dts: Add OXNAS Platform Bindings" from Neil Armstrong:
* tag 'ox810se-arm-dt-v4.6-rc3' of https://github.com/superna9999/linux:
ARM: boot: dts: Add Western Digital My Book World Edition device tree
dt-bindings: Add Western Digital to vendor prefixes
dt-bindings: Add OXNAS bindings
ARM: boot: dts: Add Oxford Semiconductor OX810SE dtsi
dt-bindings: Add Oxford Semiconductor to vendor prefixes
dt-bindings: irq: arm,versatile-fpga: add compatible string for OX810SE SoC
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 4b4f086730ca..ce086452cbee 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -563,6 +563,8 @@ dtb-$(CONFIG_ARCH_ORION5X) += \ orion5x-rd88f5182-nas.dtb dtb-$(CONFIG_ARCH_PRIMA2) += \ prima2-evb.dtb +dtb-$(CONFIG_ARCH_OXNAS) += \ + wd-mbwe.dtb dtb-$(CONFIG_ARCH_QCOM) += \ qcom-apq8064-arrow-db600c.dtb \ qcom-apq8064-cm-qs600.dtb \ |