[v2,2/2] clk: fix compile for OF && !COMMON_CLK

Commit Message

Shawn Guo July 18, 2012, 3:52 a.m. UTC

From: Rob Herring <[e-mail]>

With commit 766e6a4ec602d0c107 (clk: add DT clock binding support),
compiling with OF && !COMMON_CLK is broken.

Reported-by: Alexandre Pereira da Silva <[e-mail]>
Reported-by: Prashant Gaikwad <[e-mail]>
Signed-off-by: Rob Herring <[e-mail]>
---
 drivers/clk/clkdev.c |    2 +-
 include/linux/clk.h  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 69085e0..d423c9b 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -24,7 +24,7 @@ 
 static LIST_HEAD(clocks);
 static DEFINE_MUTEX(clocks_mutex);
 
-#ifdef CONFIG_OF
+#if defined(CONFIG_OF) && defined(CONFIG_COMMON_CLK)
 struct clk *of_clk_get(struct device_node *np, int index)
 {
 	struct of_phandle_args clkspec;
diff --git a/include/linux/clk.h b/include/linux/clk.h
index 6283e2e..f80ebad 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -364,7 +364,7 @@  int clk_add_alias(const char *alias, const char *alias_dev_name, char *id,
 struct device_node;
 struct of_phandle_args;
 
-#ifdef CONFIG_OF
+#if defined(CONFIG_OF) && defined(CONFIG_COMMON_CLK)
 struct clk *of_clk_get(struct device_node *np, int index);
 struct clk *of_clk_get_by_name(struct device_node *np, const char *name);
 struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec);