]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for...
authorTony Lindgren <tony@atomide.com>
Sun, 16 Dec 2012 19:28:10 +0000 (11:28 -0800)
committerTony Lindgren <tony@atomide.com>
Sun, 16 Dec 2012 19:28:10 +0000 (11:28 -0800)
1  2 
arch/arm/boot/dts/Makefile

index 0f441740c22a2baa931bbcf165086853d1617363,f8b4ff49b237e2cdc496f201f53d796d687217c4..b4015854d1ce7fdc644cac95f0f56350ed055a5d
@@@ -77,9 -77,7 +77,9 @@@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood
  dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
        msm8960-cdp.dtb
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
 -      armada-xp-db.dtb
 +      armada-370-mirabox.dtb \
 +      armada-xp-db.dtb \
 +      armada-xp-openblocks-ax3-4.dtb
  dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
        imx53-ard.dtb \
        imx53-evk.dtb \
@@@ -107,6 -105,7 +107,7 @@@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap242
        omap3-evm.dtb \
        omap3-tobi.dtb \
        omap4-panda.dtb \
+       omap4-panda-a4.dtb \
        omap4-panda-es.dtb \
        omap4-var-som.dtb \
        omap4-sdp.dtb \
@@@ -128,8 -127,7 +129,8 @@@ dtb-$(CONFIG_ARCH_SPEAR13XX) += spear13
        spear1340-evb.dtb
  dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \
        spear310-evb.dtb \
 -      spear320-evb.dtb
 +      spear320-evb.dtb \
 +      spear320-hmi.dtb
  dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
  dtb-$(CONFIG_ARCH_SUNXI) += sun4i-cubieboard.dtb \
        sun5i-olinuxino.dtb