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 'jfs-5.2' of git://github.com/kleikamp/linux-shaggy
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx28-duckbill-2-485.dts
diff --git
a/arch/arm/boot/dts/imx28-duckbill-2-485.dts
b/arch/arm/boot/dts/imx28-duckbill-2-485.dts
index f4f2b3d16c8e166d060bc45dc8aadd8e136e45bb..19957c2406e8c945be1478bf25b742a61f8e88b2 100644
(file)
--- a/
arch/arm/boot/dts/imx28-duckbill-2-485.dts
+++ b/
arch/arm/boot/dts/imx28-duckbill-2-485.dts
@@
-20,6
+20,7
@@
compatible = "i2se,duckbill-2-485", "i2se,duckbill-2", "fsl,imx28";
memory@40000000 {
+ device_type = "memory";
reg = <0x40000000 0x08000000>;
};