Merge branch 'next/mct-exynos' into next/clk-exynos
authorKukjin Kim <kgene.kim@samsung.com>
Sat, 9 Mar 2013 07:56:34 +0000 (16:56 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 9 Mar 2013 07:56:34 +0000 (16:56 +0900)
Conflicts:
arch/arm/mach-exynos/mach-exynos4-dt.c

1  2 
arch/arm/Kconfig
arch/arm/boot/dts/exynos5250.dtsi
arch/arm/mach-exynos/Kconfig
arch/arm/mach-exynos/mach-exynos4-dt.c
arch/arm/mach-exynos/mach-exynos5-dt.c

Simple merge
Simple merge
Simple merge
  */
  
  #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