From: Kukjin Kim <kgene.kim@samsung.com>
Date: Sat, 9 Mar 2013 07:56:34 +0000 (+0900)
Subject: Merge branch 'next/mct-exynos' into next/clk-exynos
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8ec46b97f24d60645c8f708c87e0caecebd25d77;p=linux-beck.git

Merge branch 'next/mct-exynos' into next/clk-exynos

Conflicts:
	arch/arm/mach-exynos/mach-exynos4-dt.c
---

8ec46b97f24d60645c8f708c87e0caecebd25d77
diff --cc arch/arm/mach-exynos/mach-exynos4-dt.c
index fad268f8548c,c4ae108e192d..daa7b0da9a2d
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@@ -12,9 -12,8 +12,10 @@@
  */
  
  #include <linux/of_platform.h>
 +#include <linux/of_fdt.h>
  #include <linux/serial_core.h>
 +#include <linux/memblock.h>
+ #include <linux/clocksource.h>
  
  #include <asm/mach/arch.h>
  #include <mach/map.h>
@@@ -158,8 -143,7 +159,8 @@@ DT_MACHINE_START(EXYNOS4210_DT, "Samsun
  	.map_io		= exynos4_dt_map_io,
  	.init_machine	= exynos4_dt_machine_init,
  	.init_late	= exynos_init_late,
- 	.init_time	= exynos4_timer_init,
+ 	.init_time	= clocksource_of_init,
  	.dt_compat	= exynos4_dt_compat,
  	.restart        = exynos4_restart,
 +	.reserve	= exynos4_reserve,
  MACHINE_END