]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'v3.16-next/soc-exynos' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Wed, 14 May 2014 20:57:54 +0000 (05:57 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Wed, 14 May 2014 20:57:54 +0000 (05:57 +0900)
1  2 
arch/arm/boot/dts/Makefile

index b20c46233bd9a2fa26ee110676c4596434f7cf60,1585ab4a5f1f39639f8e90431b366593c7aebf66..cd399a208ec7eecae392a8b45533d8c2078d2234
@@@ -72,11 -73,12 +72,13 @@@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210
        exynos5250-arndale.dtb \
        exynos5250-smdk5250.dtb \
        exynos5250-snow.dtb \
+       exynos5260-xyref5260.dtb \
        exynos5420-arndale-octa.dtb \
 +      exynos5420-peach-pit.dtb \
        exynos5420-smdk5420.dtb \
        exynos5440-sd5v1.dtb \
-       exynos5440-ssdk5440.dtb
+       exynos5440-ssdk5440.dtb \
+       exynos5800-peach-pi.dtb
  dtb-$(CONFIG_ARCH_HI3xxx) += hi3620-hi4511.dtb
  dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
        ecx-2000.dtb