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 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
orion5x-maxtor-shared-storage-2.dts
diff --git
a/arch/arm/boot/dts/orion5x-maxtor-shared-storage-2.dts
b/arch/arm/boot/dts/orion5x-maxtor-shared-storage-2.dts
index 0324cb54939d463d2cefd5d733cd52f7e7378027..0ca6208a267de1e56e2abfaa71b19c453d3dcd83 100644
(file)
--- a/
arch/arm/boot/dts/orion5x-maxtor-shared-storage-2.dts
+++ b/
arch/arm/boot/dts/orion5x-maxtor-shared-storage-2.dts
@@
-19,6
+19,7
@@
compatible = "maxtor,shared-storage-2", "marvell,orion5x-88f5182", "marvell,orion5x";
memory {
+ device_type = "memory";
reg = <0x00000000 0x4000000>; /* 64 MB */
};