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 'platform-drivers-x86-v4.17-1' of git://git.infradead.org/linux-platform...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx7d-colibri-emmc.dtsi
diff --git
a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
index 9b63b9c89e4b6a49f015eb8aeea9ed17e8c5c257..04d24ee17b142f498fe781070f729cf8ad44490c 100644
(file)
--- a/
arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
+++ b/
arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
@@
-7,7
+7,7
@@
#include "imx7-colibri.dtsi"
/ {
- memory {
+ memory
@80000000
{
reg = <0x80000000 0x40000000>;
};
};