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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
lpc32xx.dtsi
diff --git
a/arch/arm/boot/dts/lpc32xx.dtsi
b/arch/arm/boot/dts/lpc32xx.dtsi
index d81fe433e3c82eafa0ea1703a5b6fe7905e6f7ac..abff7ef7c9cd6a571a5966ff75f473215c737233 100644
(file)
--- a/
arch/arm/boot/dts/lpc32xx.dtsi
+++ b/
arch/arm/boot/dts/lpc32xx.dtsi
@@
-55,7
+55,7
@@
<0x20000000 0x20000000 0x30000000>,
<0xe0000000 0xe0000000 0x04000000>;
- iram: sram@
0
8000000 {
+ iram: sram@8000000 {
compatible = "mmio-sram";
reg = <0x08000000 0x20000>;