From acf3c91636de36f049d94c3a15ff0e90559bbbf7 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 18 Jul 2012 11:52:23 +0800 Subject: [PATCH] --- yaml --- r: 316625 b: refs/heads/master c: 137f8a7213d80c1388ca48280c1ef0856b6fec30 h: refs/heads/master i: 316623: eead2cb97bf92c88a6a040a8ee24f07be873f3c9 v: v3 --- [refs] | 2 +- trunk/drivers/clk/clkdev.c | 2 +- trunk/include/linux/clk.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7e8319197e78..f4ac0e042aae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f1612d351a8e57d3d694e828641d3e4eeb224f8 +refs/heads/master: 137f8a7213d80c1388ca48280c1ef0856b6fec30 diff --git a/trunk/drivers/clk/clkdev.c b/trunk/drivers/clk/clkdev.c index 69085e02bd58..d423c9bdd71a 100644 --- a/trunk/drivers/clk/clkdev.c +++ b/trunk/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/trunk/include/linux/clk.h b/trunk/include/linux/clk.h index 071e24083dc8..6587b5280583 100644 --- a/trunk/include/linux/clk.h +++ b/trunk/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);