projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2d062f5
)
ARM: dts: Remove redundant sysreg node from exynos4.dtsi
author
Sylwester Nawrocki
<s.nawrocki@samsung.com>
Tue, 25 Jun 2013 18:23:35 +0000
(20:23 +0200)
committer
Chanho Park
<chanho61.park@samsung.com>
Tue, 18 Nov 2014 02:43:16 +0000
(11:43 +0900)
Remove the incorrect sysreg node, which is likely in this file
due to wrong merge conflict resolution.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
arch/arm/boot/dts/exynos4.dtsi
patch
|
blob
|
history
diff --git
a/arch/arm/boot/dts/exynos4.dtsi
b/arch/arm/boot/dts/exynos4.dtsi
index
2f2a5f4
..
7620fce
100644
(file)
--- a/
arch/arm/boot/dts/exynos4.dtsi
+++ b/
arch/arm/boot/dts/exynos4.dtsi
@@
-115,11
+115,6
@@
arm,tag-latency = <1 1 0>;
};
- sys_reg: sysreg {
- compatible = "exynos4-sysreg", "syscon";
- reg = <0x10010000 0x400>;
- };
-
mipi_phy: video-phy@10020710 {
compatible = "samsung,s5pv210-mipi-video-phy";
reg = <0x10020710 8>;