diff --git a/[refs] b/[refs] index 8995c25b94f1..d6d809582d42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46743dd66224a2bc3bfb4a45b27bfc2a41bfda24 +refs/heads/master: 4bacf2a3fc07a89b4c0dca5a90e68eace9ea8813 diff --git a/trunk/arch/arm/boot/dts/imx6q-arm2.dts b/trunk/arch/arm/boot/dts/imx6q-arm2.dts index 53eb241fa5ad..cd5813da1cee 100644 --- a/trunk/arch/arm/boot/dts/imx6q-arm2.dts +++ b/trunk/arch/arm/boot/dts/imx6q-arm2.dts @@ -11,7 +11,7 @@ */ /dts-v1/; -/include/ "imx6q.dtsi" +/include/ "imx6qdl.dtsi" / { model = "Freescale i.MX6 Quad Armadillo2 Board"; diff --git a/trunk/arch/arm/boot/dts/imx6q-sabreauto.dts b/trunk/arch/arm/boot/dts/imx6q-sabreauto.dts index 656d489122fe..5baa82427f3f 100644 --- a/trunk/arch/arm/boot/dts/imx6q-sabreauto.dts +++ b/trunk/arch/arm/boot/dts/imx6q-sabreauto.dts @@ -11,7 +11,7 @@ */ /dts-v1/; -/include/ "imx6q.dtsi" +/include/ "imx6qdl.dtsi" / { model = "Freescale i.MX6 Quad SABRE Automotive Board"; diff --git a/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts b/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts index 2ce355cd05e5..6aaaf69e88eb 100644 --- a/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts +++ b/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts @@ -11,7 +11,7 @@ */ /dts-v1/; -/include/ "imx6q.dtsi" +/include/ "imx6qdl.dtsi" / { model = "Freescale i.MX6 Quad SABRE Lite Board"; diff --git a/trunk/arch/arm/boot/dts/imx6q-sabresd.dts b/trunk/arch/arm/boot/dts/imx6q-sabresd.dts index 2dea304a7980..a48528f6f042 100644 --- a/trunk/arch/arm/boot/dts/imx6q-sabresd.dts +++ b/trunk/arch/arm/boot/dts/imx6q-sabresd.dts @@ -11,7 +11,7 @@ */ /dts-v1/; -/include/ "imx6q.dtsi" +/include/ "imx6qdl.dtsi" / { model = "Freescale i.MX6Q SABRE Smart Device Board"; diff --git a/trunk/arch/arm/boot/dts/imx6q.dtsi b/trunk/arch/arm/boot/dts/imx6qdl.dtsi similarity index 100% rename from trunk/arch/arm/boot/dts/imx6q.dtsi rename to trunk/arch/arm/boot/dts/imx6qdl.dtsi