diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2013-06-25 20:23:35 +0200 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:43:16 +0900 |
| commit | cb6b12586fccda57224b787c6f911c106762bde2 (patch) | |
| tree | 4c78e81eac8735389db2d9d1a6e441f42068c857 /arch | |
| parent | 2d062f57d9ffc6849db2f63a5d16b40b063aabf7 (diff) | |
| download | linux-3.10-cb6b12586fccda57224b787c6f911c106762bde2.tar.gz linux-3.10-cb6b12586fccda57224b787c6f911c106762bde2.tar.bz2 linux-3.10-cb6b12586fccda57224b787c6f911c106762bde2.zip | |
ARM: dts: Remove redundant sysreg node from exynos4.dtsi
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/exynos4.dtsi | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index 2f2a5f42d4f..7620fce0e82 100644 --- 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>; |