Merge branch 'kbuild/misc' into kbuild/for-next

[karo-tx-linux.git] / include / asm-generic / clkdev.h

diff --git a/include/asm-generic/clkdev.h b/include/asm-generic/clkdev.h
index 90a32a61dd214f2b61fa0bb129672b12239cb559..4ff334749ed53670d91807992f0691fb8b88b288 100644 (file)
--- a/include/asm-generic/clkdev.h
+++ b/include/asm-generic/clkdev.h
@@ -15,10 +15,12 @@
 
 #include <linux/slab.h>
 
+#ifndef CONFIG_COMMON_CLK
 struct clk;
 
 static inline int __clk_get(struct clk *clk) { return 1; }
 static inline void __clk_put(struct clk *clk) { }
+#endif
 
 static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size)
 {