Merge tag 'sunxi-dt-for-3.9' of https://github.com/mripard/linux into next/dt
authorOlof Johansson <olof@lixom.net>
Mon, 18 Feb 2013 00:31:51 +0000 (16:31 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 18 Feb 2013 00:31:51 +0000 (16:31 -0800)
From Maxime Ripard:
Allwinner sunXi DT additions for 3.9

* tag 'sunxi-dt-for-3.9' of https://github.com/mripard/linux:
  sunxi: a13-olinuxino: Add user LED to the device tree
  sunxi: a10-cubieboard: Add user LEDs to the device tree
  ARM: sunxi: Add device tree for Miniand Hackberry

1  2 
arch/arm/boot/dts/Makefile

@@@ -135,9 -132,9 +135,10 @@@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-
        spear320-hmi.dtb
  dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
  dtb-$(CONFIG_ARCH_SUNXI) += sun4i-a10-cubieboard.dtb \
+       sun4i-a10-hackberry.dtb \
        sun5i-a13-olinuxino.dtb
  dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
 +      tegra20-iris-512.dtb \
        tegra20-medcom-wide.dtb \
        tegra20-paz00.dtb \
        tegra20-plutux.dtb \