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 'sound-fix-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6sx-nitrogen6sx.dts
diff --git
a/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
b/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
index f9d40ee149824186442a0d4d8352f4ed9d59aaf1..b58f770c40d96f4b6e90d20c88ca3b03df48d354 100644
(file)
--- a/
arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
+++ b/
arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
@@
-52,7
+52,7
@@
t_lcd = &t_lcd;
};
- memory {
+ memory
@80000000
{
reg = <0x80000000 0x40000000>;
};