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 'zynq-dt-for-v5.0' of https://github.com/Xilinx/linux-xlnx into next/dt
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6q-ts7970.dts
diff --git
a/arch/arm/boot/dts/imx6q-ts7970.dts
b/arch/arm/boot/dts/imx6q-ts7970.dts
index c615ac4feede152a9e28d7ffaca443ed3609d7c6..570bd3c309a6e5bc3e7b67d004ff8e95428bbdc6 100644
(file)
--- a/
arch/arm/boot/dts/imx6q-ts7970.dts
+++ b/
arch/arm/boot/dts/imx6q-ts7970.dts
@@
-50,6
+50,7
@@
/* Will be filled by the bootloader */
memory@10000000 {
+ device_type = "memory";
reg = <0x10000000 0>;
};
};