From dc822e57ee05856291a8c9324d2309076ee5f5e2 Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Sat, 5 Nov 2011 11:08:54 +0900 Subject: 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 [ 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 --- arch/arm/mach-exynos4/clock.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'arch/arm/mach-exynos4') 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(); } -- cgit v1.2.3