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 branch 'omap-for-v4.21/dt' into omap-for-v5.1/dt
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6ull-colibri-nonwifi.dtsi
diff --git
a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
index 10ab4697950f51e001a8c483e09e9c8cd0240c27..fb213bec465435a80d1ab44f71592cba1aee71ba 100644
(file)
--- a/
arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
+++ b/
arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
@@
-7,6
+7,7
@@
/ {
memory@80000000 {
+ device_type = "memory";
reg = <0x80000000 0x10000000>;
};
};