diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-11-05 11:08:54 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-05 09:32:04 -0700 |
| commit | dc822e57ee05856291a8c9324d2309076ee5f5e2 (patch) | |
| tree | 09ba4bd0c4b5938d56fe680916174b511a7e8a9f | |
| parent | 5c8a0fbba543d9428a486f0d1282bbcf3cf1d95a (diff) | |
ARM: EXYNOS4: Fix the merge conflict
The mark of conflict should be removed.
This happened at the commit fba9569924e0 ("Merge branch 'next' of
git://git.infradead.org/users/vkoul/slave-dma")
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
[ I always check the conflict resolution with "git diff" before I add
the result, but I clearly missed that this time, and didn't notice the
second conflict in that file after having fixed the first one.
Oops, my bad. - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/arm/mach-exynos4/clock.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-exynos4/clock.c b/arch/arm/mach-exynos4/clock.c index e21952dfb7e..a52024e309b 100644 --- a/arch/arm/mach-exynos4/clock.c +++ b/arch/arm/mach-exynos4/clock.c @@ -1286,11 +1286,8 @@ void __init exynos4_register_clocks(void) s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off)); s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off)); -<<<<<<< HEAD register_syscore_ops(&exynos4_clock_syscore_ops); -======= s3c24xx_register_clock(&dummy_apb_pclk); ->>>>>>> 4598fc2c94b68740e0269db03c98a1e7ad5af773 s3c_pwmclk_init(); } |