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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
ste-href.dtsi
diff --git
a/arch/arm/boot/dts/ste-href.dtsi
b/arch/arm/boot/dts/ste-href.dtsi
index 9e359e4f342e76ebd1fbfab57d1f8f427ece2cd7..feb682a3d3635d907a1abd2f538de42648dc2c1a 100644
(file)
--- a/
arch/arm/boot/dts/ste-href.dtsi
+++ b/
arch/arm/boot/dts/ste-href.dtsi
@@
-15,6
+15,7
@@
/ {
memory {
+ device_type = "memory";
reg = <0x00000000 0x20000000>;
};