diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-03 16:53:57 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-03 16:53:57 +1000 |
| commit | 6df6b7d3c754b830807e9aad8f78db47d522d396 (patch) | |
| tree | d29869f7ecfa7b8bf6d58b0dc8d527242ace2082 /arch/arm/boot/dts/exynos3250.dtsi | |
| parent | 7086e781d53a0ea18581b068f140769d68f47dc7 (diff) | |
| parent | 833628771769063487eeab6ae24a0e14e2464271 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
drivers/clk/Kconfig
Diffstat (limited to 'arch/arm/boot/dts/exynos3250.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/exynos3250.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi index 31ee99319a20..242ddda0a8cd 100644 --- a/arch/arm/boot/dts/exynos3250.dtsi +++ b/arch/arm/boot/dts/exynos3250.dtsi @@ -176,7 +176,7 @@ }; rtc: rtc@10070000 { - compatible = "samsung,s3c6410-rtc"; + compatible = "samsung,exynos3250-rtc"; reg = <0x10070000 0x100>; interrupts = <0 73 0>, <0 74 0>; status = "disabled"; |