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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
exynos4412-origen.dts
diff --git
a/arch/arm/boot/dts/exynos4412-origen.dts
b/arch/arm/boot/dts/exynos4412-origen.dts
index 8a89eb893d644d46ad79d7f3e7161edb2d0eccf0..b0b5ec7903a53e91ac6f235d3167b0bbb6846b90 100644
(file)
--- a/
arch/arm/boot/dts/exynos4412-origen.dts
+++ b/
arch/arm/boot/dts/exynos4412-origen.dts
@@
-32,7
+32,7
@@
stdout-path = &serial_2;
};
- firmware@
0203F
000 {
+ firmware@
203f
000 {
compatible = "samsung,secure-firmware";
reg = <0x0203F000 0x1000>;
};