From: Olof Johansson Date: Mon, 18 Feb 2013 00:31:51 +0000 (-0800) Subject: Merge tag 'sunxi-dt-for-3.9' of https://github.com/mripard/linux into next/dt X-Git-Tag: next-20130220~18^2~13^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c56cc512e2aaf22c45ecd894489132e6a063fa7c;p=karo-tx-linux.git Merge tag 'sunxi-dt-for-3.9' of https://github.com/mripard/linux into next/dt 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 --- c56cc512e2aaf22c45ecd894489132e6a063fa7c diff --cc arch/arm/boot/dts/Makefile index 43c044b86e13,b5dd25886f4a..4b80c5c5ede0 --- a/arch/arm/boot/dts/Makefile +++ b/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 \