X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=arch%2Fblackfin%2Finclude%2Fasm%2Fclkdev.h;h=7ac2436856a523074f301c5c3f884efc3bc0bb72;hb=268943fb7529a15254a5247372119ba4bd735e94;hp=9053beda8c5065d0c4fe4a7c148baea406f623ba;hpb=4e3c8a1b1c63482403e9d5e3148dee1a711e4b91;p=~andy%2Flinux

diff --git a/arch/blackfin/include/asm/clkdev.h b/arch/blackfin/include/asm/clkdev.h
index 9053beda8c5..7ac2436856a 100644
--- 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