Merge tag 'stable/for-linus-3.12-rc0-tag-two' of git://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-shmobile / board-kzm9d-reference.c

diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c
index a7b28b24ab38e6bbcf038eb29568cf740a4d2335..8f8bb2fab07697413486d9ac07b4004b528a05bf 100644 (file)
--- a/arch/arm/mach-shmobile/board-kzm9d-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9d-reference.c
@@ -26,7 +26,8 @@
 
 static void __init kzm9d_add_standard_devices(void)
 {
-       emev2_clock_init();
+       if (!IS_ENABLED(CONFIG_COMMON_CLK))
+               emev2_clock_init();
 
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }