projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
imx6ull-14x14-evk.dts
diff --git
a/arch/arm/boot/dts/imx6ull-14x14-evk.dts
b/arch/arm/boot/dts/imx6ull-14x14-evk.dts
index
4741871
..
30ef603
100644
(file)
--- a/
arch/arm/boot/dts/imx6ull-14x14-evk.dts
+++ b/
arch/arm/boot/dts/imx6ull-14x14-evk.dts
@@
-39,7
+39,10
@@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "imx6ul-14x14-evk.dts"
+/dts-v1/;
+
+#include "imx6ull.dtsi"
+#include "imx6ul-14x14-evk.dtsi"
/ {
model = "Freescale i.MX6 UlltraLite 14x14 EVK Board";