From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 26 Apr 2016 11:41:51 +0000 (+0200)
Subject: Merge tag 'ox810se-arm-dt-v4.6-rc3' of https://github.com/superna9999/linux into... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6945248f34b95330700f3d2632608457abaddb18;p=linux-beck.git

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
---

6945248f34b95330700f3d2632608457abaddb18
diff --cc arch/arm/boot/dts/Makefile
index 4b4f086730ca,7005585030ae..ce086452cbee
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -563,8 -538,9 +563,10 @@@ 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 \
  	qcom-apq8064-ifc6410.dtb \
  	qcom-apq8064-sony-xperia-yuga.dtb \