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 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
omap3-sniper.dts
diff --git
a/arch/arm/boot/dts/omap3-sniper.dts
b/arch/arm/boot/dts/omap3-sniper.dts
index 78a1184cb312ad5b9dc01645b5bd9117037d2c3c..bc4498e77bc9bc0fd4bfc48b462ef89671cd9617 100644
(file)
--- a/
arch/arm/boot/dts/omap3-sniper.dts
+++ b/
arch/arm/boot/dts/omap3-sniper.dts
@@
-20,7
+20,7
@@
};
};
- memory {
+ memory
@80000000
{
device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */
};