diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-25 23:26:53 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-25 23:26:53 -0800 |
commit | 8d2282a77bf0977e7033d8ea5970f369bc28f0f0 (patch) | |
tree | 25af2fa8e1b4c001ebdbc97f465f946786ba1678 /arch/arm/boot/dts/Makefile | |
parent | 24025f6f5821bf3715b283f6490212ac44d6a4fe (diff) | |
parent | 25d6dd859e73248432051257b4b4d2a3d51b295b (diff) | |
download | op-kernel-dev-8d2282a77bf0977e7033d8ea5970f369bc28f0f0.zip op-kernel-dev-8d2282a77bf0977e7033d8ea5970f369bc28f0f0.tar.gz |
Merge tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
From Shawn Guo:
They are a few mxs dts updates coming a little bit late. I'm sending
them as the second mxs/dt pull request for 3.8. Please consider to
pull.
* tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: dts: mxs: add oled support for the cfa-10036
ARM: mxs: Add SchulerControl SPS1 DTS file
ARM: imx23-olinuxino: Add spi support
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index e1e2a6d..83faa72 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -67,6 +67,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ imx28-cfa10049.dtb \ imx28-evk.dtb \ imx28-m28evk.dtb \ + imx28-sps1.dtb \ imx28-tx28.dtb dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ omap3-beagle.dtb \ |