git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6ul-isiot-nand.dts
diff --git
a/arch/arm/boot/dts/imx6ul-isiot-nand.dts
b/arch/arm/boot/dts/imx6ul-isiot-nand.dts
index da29a86eb6a8f83dc9e3fc64bf50f4b6d0cd2b74..de15e1c75dd1ddf606976d0f3571fdf6bb1c10e7 100644
(file)
--- a/
arch/arm/boot/dts/imx6ul-isiot-nand.dts
+++ b/
arch/arm/boot/dts/imx6ul-isiot-nand.dts
@@
-43,7
+43,6
@@
/dts-v1/;
#include "imx6ul-isiot.dtsi"
-#include "imx6ul-isiot-common.dtsi"
/ {
model = "Engicam Is.IoT MX6UL NAND Starter kit";