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
/
imx6sx-udoo-neo-basic.dts
diff --git
a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
index 0c1fc1a8f913aaab0888a927bad4fd804423af06..40ccdf43dffc56109dedb9cbca391c2a7ca2c711 100644
(file)
--- a/
arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
+++ b/
arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
@@
-48,7
+48,7
@@
model = "UDOO Neo Basic";
compatible = "udoo,neobasic", "fsl,imx6sx";
- memory {
+ memory
@80000000
{
reg = <0x80000000 0x20000000>;
};
};