From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 19 Feb 2013 19:34:19 +0000 (+0100)
Subject: Merge branch 'late/mvebu' into for-next
X-Git-Tag: next-20130220~18^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a95d9907a2b55a8f9385ac19695ea294eb21c5f2;p=karo-tx-linux.git

Merge branch 'late/mvebu' into for-next

* late/mvebu:
  arm: mvebu: update defconfig with ATAG support when using DT
  ARM: mvebu: Update defconfig to select SPI flash and MTD support
  ARM: mvebu: Update defconfig to select SPI support
  arm: mvebu: support for the new Armada XP development board(DB-MV784MP-GP)
  arm: mvebu: update defconfig with local timer support
  clocksource: time-armada-370-xp: add local timer support
  arm: mvebu: Add support for local interrupt
  arm: mvebu: Update defconfig to select USB support
  ARM: kirkwood: convert Guruplug Server Plus to use the device tree
  arm: mvebu: add DTS file for Marvell RD-A370-A1 board
  arm: mvebu: Improve the SMP support of the interrupt controller
  ARM: Dove: split legacy and DT setup
  ARM: dove: update dove_defconfig with a few useful options
  ARM: Kirkwood: Remove redundent SDIO clock alias
  ARM: Kirkwood: Remove redundent USB clock alias
  arm: mvebu: add LEDs support to defconfig file
  arm: mvebu: enable btmrvl driver in mvebu_defconfig
  arm: mvebu: enable mwifiex driver in mvebu_defconfig
  arm: mvebu: enable SDIO support in mvebu_defconfig
  arm: mvebu: Update defconfig with Marvell RTC support
---

a95d9907a2b55a8f9385ac19695ea294eb21c5f2
diff --cc arch/arm/boot/dts/Makefile
index e007134cc2ca,157fbebc9c24..9c6255884cbb
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -78,19 -78,13 +79,21 @@@ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.
  	msm8960-cdp.dtb
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
  	armada-370-mirabox.dtb \
+ 	armada-370-rd.dtb \
  	armada-xp-db.dtb \
+ 	armada-xp-gp.dtb \
  	armada-xp-openblocks-ax3-4.dtb
 -dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
 +dtb-$(CONFIG_ARCH_MXC) += \
 +	imx25-karo-tx25.dtb \
 +	imx25-pdk.dtb \
 +	imx27-apf27.dtb \
 +	imx27-pdk.dtb \
 +	imx31-bug.dtb \
 +	imx51-apf51.dtb \
 +	imx51-babbage.dtb \
  	imx53-ard.dtb \
  	imx53-evk.dtb \
 +	imx53-mba53.dtb \
  	imx53-qsb.dtb \
  	imx53-smd.dtb \
  	imx6q-arm2.dtb \