diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-07-18 05:52:23 +0200 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2012-07-19 23:07:56 +0200 |
| commit | 137f8a7213d80c1388ca48280c1ef0856b6fec30 (patch) | |
| tree | e304419eda442ca03a9997d6fdef12ef69b50830 | |
| parent | clk: fix clk_get on of_clk_get_by_name return check (diff) | |
| download | linux-137f8a7213d80c1388ca48280c1ef0856b6fec30.tar.xz linux-137f8a7213d80c1388ca48280c1ef0856b6fec30.zip | |
clk: fix compile for OF && !COMMON_CLK
With commit 766e6a4ec602d0c107 (clk: add DT clock binding support),
compiling with OF && !COMMON_CLK is broken.
Reported-by: Alexandre Pereira da Silva <aletes.xgr@gmail.com>
Reported-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
| -rw-r--r-- | drivers/clk/clkdev.c | 2 | ||||
| -rw-r--r-- | include/linux/clk.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index 69085e02bd58..d423c9bdd71a 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 071e24083dc8..6587b5280583 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -314,7 +314,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); |