aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-11-16 07:19:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-11-16 07:19:45 -0800
commite057aad191ce1a1ebd452877fd9d540e6bd64c6e (patch)
tree7d05c37197fb968821dbdae9984837b41cb21a8d
parentc5e35d6c512c43105883043dd62cf7257ec3f9f0 (diff)
parent93532c8a4890871aa0d84dd91b80dad9f58542e0 (diff)
downloadlinux-stericsson-e057aad191ce1a1ebd452877fd9d540e6bd64c6e.tar.gz
Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux
Pull another clk layer fix from Michael Turquette: "GCC 4.7 users get compilation errors from unnecessary use of inline in clk-provider.h. This pull request fixes the regression by removing inline usage from those function declarations." * tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux: clk: remove inline usage from clk-provider.h
-rw-r--r--include/linux/clk-provider.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index c12731582920..f9f5e9eeb9dd 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -335,8 +335,8 @@ const char *__clk_get_name(struct clk *clk);
struct clk_hw *__clk_get_hw(struct clk *clk);
u8 __clk_get_num_parents(struct clk *clk);
struct clk *__clk_get_parent(struct clk *clk);
-inline int __clk_get_enable_count(struct clk *clk);
-inline int __clk_get_prepare_count(struct clk *clk);
+int __clk_get_enable_count(struct clk *clk);
+int __clk_get_prepare_count(struct clk *clk);
unsigned long __clk_get_rate(struct clk *clk);
unsigned long __clk_get_flags(struct clk *clk);
int __clk_is_enabled(struct clk *clk);