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 'ceph-for-4.17-rc1' of git://github.com/ceph/ceph-client
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx28-sps1.dts
diff --git
a/arch/arm/boot/dts/imx28-sps1.dts
b/arch/arm/boot/dts/imx28-sps1.dts
index 0ce3cb8e7914ecebdaccd0b576bdd2f3420329e8..2393e83979e0d2c4e627265fd6515aae87c94987 100644
(file)
--- a/
arch/arm/boot/dts/imx28-sps1.dts
+++ b/
arch/arm/boot/dts/imx28-sps1.dts
@@
-16,7
+16,7
@@
model = "SchulerControl GmbH, SC SPS 1";
compatible = "schulercontrol,imx28-sps1", "fsl,imx28";
- memory {
+ memory
@40000000
{
reg = <0x40000000 0x08000000>;
};