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 tag 'fsdax-fix-5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
imx6ulz-14x14-evk.dts
diff --git
a/arch/arm/boot/dts/imx6ulz-14x14-evk.dts
b/arch/arm/boot/dts/imx6ulz-14x14-evk.dts
index
6f1af24
..
483d973
100644
(file)
--- a/
arch/arm/boot/dts/imx6ulz-14x14-evk.dts
+++ b/
arch/arm/boot/dts/imx6ulz-14x14-evk.dts
@@
-9,6
+9,8
@@
/delete-node/ &fec1;
/delete-node/ &fec2;
+/delete-node/ &can1;
+/delete-node/ &can2;
/delete-node/ &lcdif;
/delete-node/ &tsc;