Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze

[u-boot] / arch / arm / dts / exynos4210.dtsi

diff --git a/arch/arm/dts/exynos4210.dtsi b/arch/arm/dts/exynos4210.dtsi
index 48ecd7a755ab90cdca387a2a8de9898c180bd849..634a5c1dd2759d1b62be11e7818cba9417079cba 100644 (file)
--- a/arch/arm/dts/exynos4210.dtsi
+++ b/arch/arm/dts/exynos4210.dtsi
@@ -21,6 +21,7 @@
 
 #include "exynos4.dtsi"
 #include "exynos4210-pinctrl.dtsi"
+#include "exynos4210-pinctrl-uboot.dtsi"
 
 / {
        compatible = "samsung,exynos4210";