Merge branches 'devel/debug_ll_init' and 'calxeda/ecx-2000' into next/soc2
authorArnd Bergmann <arnd@arndb.de>
Mon, 12 Nov 2012 22:02:45 +0000 (23:02 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 12 Nov 2012 22:02:45 +0000 (23:02 +0100)
Dependencies for highbank debug_ll_init patch

1  2  3 
arch/arm/boot/dts/Makefile

index a9d8a10d1ac6f81f4ef44f720d6e0f3b099e4aaf,f37cf9fa5fa073318b3c6faad5d0a1480bd99826,5cc95667fa3beded950592c53c6d23993e204811..b994045802b0af6efff0d89cc8261aa780a42fbb
@@@@ -24,7 -24,7 -24,8 +24,8 @@@@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210
        exynos4210-smdkv310.dtb \
        exynos4210-trats.dtb \
        exynos5250-smdk5250.dtb
-- dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb
++ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
++      ecx-2000.dtb
   dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
        integratorcp.dtb
   dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
@@@@ -77,8 -77,7 -78,7 +78,8 @@@@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb
   dtb-$(CONFIG_ARCH_U8500) += snowball.dtb
   dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
        r8a7740-armadillo800eva.dtb \
 --     sh73a0-kzm9g.dtb
 ++     sh73a0-kzm9g.dtb \
 ++     sh7372-mackerel.dtb
   dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
        spear1340-evb.dtb
   dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \
This page took 0.049042 seconds and 5 git commands to generate.