Commit dc822e57 authored Nov 05, 2011 by Kukjin Kim Committed by Linus Torvalds Nov 05, 2011

ARM: EXYNOS4: Fix the merge conflict

The mark of conflict should be removed.

This happened at the commit fba95699 ("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>

parent 5c8a0fbb

arch/arm/mach-exynos4/clock.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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();
		}