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 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx1-ads.dts
diff --git
a/arch/arm/boot/dts/imx1-ads.dts
b/arch/arm/boot/dts/imx1-ads.dts
index a1d81badb5c8ad5b801915be447ee095c90d8ca7..119b19ba53b6d8d66c9683f1ffdef3571c0a2af7 100644
(file)
--- a/
arch/arm/boot/dts/imx1-ads.dts
+++ b/
arch/arm/boot/dts/imx1-ads.dts
@@
-21,6
+21,7
@@
};
memory@8000000 {
+ device_type = "memory";
reg = <0x08000000 0x04000000>;
};
};