From e006502126a6a1f3afd879afa9101cc3df8b11f9 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 11 Dec 2013 15:13:53 +0100 Subject: [PATCH] ARM: shmobile: koelsch-reference: Remove duplicate CCF initialization The common clock framework is initialized in the rcar_gen2_init_timer() function, remove the of_clk_init() call. Signed-off-by: Laurent Pinchart Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/board-koelsch-reference.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c index a804a1798a71..4b48e2d4dec4 100644 --- a/arch/arm/mach-shmobile/board-koelsch-reference.c +++ b/arch/arm/mach-shmobile/board-koelsch-reference.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include #include #include #include @@ -29,9 +28,7 @@ static void __init koelsch_add_standard_devices(void) { -#ifdef CONFIG_COMMON_CLK - of_clk_init(NULL); -#else +#ifndef CONFIG_COMMON_CLK r8a7791_clock_init(); #endif r8a7791_add_dt_devices(); -- 2.34.1