Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / blackfin / include / asm / clkdev.h

diff --git a/arch/blackfin/include/asm/clkdev.h b/arch/blackfin/include/asm/clkdev.h
index 9053beda8c5065d0c4fe4a7c148baea406f623ba..7ac2436856a523074f301c5c3f884efc3bc0bb72 100644 (file)
--- a/arch/blackfin/include/asm/clkdev.h
+++ b/arch/blackfin/include/asm/clkdev.h
@@ -8,7 +8,9 @@ static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size)
        return kzalloc(size, GFP_KERNEL);
 }
 
+#ifndef CONFIG_COMMON_CLK
 #define __clk_put(clk)
 #define __clk_get(clk) ({ 1; })
+#endif
 
 #endif