diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-04-07 09:59:35 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-04-07 09:59:35 +0200 |
commit | 4cd023c77942f48efded3e9e47c2be823d5c8d82 (patch) | |
tree | b6790388da4c11d50cc7b22ee915fc6133b051c0 /drivers/clk | |
parent | 011aec6558e93b01c64202929a6ae90a334a3742 (diff) | |
parent | e4f81050e098074792730b61563538d9e394e3d6 (diff) | |
download | barebox-4cd023c77942f48efded3e9e47c2be823d5c8d82.tar.gz barebox-4cd023c77942f48efded3e9e47c2be823d5c8d82.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/clk-fixed-factor.c | 2 | ||||
-rw-r--r-- | drivers/clk/clk-fixed.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c index a3dbf334a8..0be48558e6 100644 --- a/drivers/clk/clk-fixed-factor.c +++ b/drivers/clk/clk-fixed-factor.c @@ -93,7 +93,6 @@ struct clk *clk_fixed_factor(const char *name, return &f->clk; } -#if defined(CONFIG_COMMON_CLK_OF_PROVIDER) /** * of_fixed_factor_clk_setup() - Setup function for simple fixed factor clock */ @@ -127,4 +126,3 @@ static int of_fixed_factor_clk_setup(struct device_node *node) } CLK_OF_DECLARE(fixed_factor_clk, "fixed-factor-clock", of_fixed_factor_clk_setup); -#endif diff --git a/drivers/clk/clk-fixed.c b/drivers/clk/clk-fixed.c index f0f7fbaed5..57bf36b39e 100644 --- a/drivers/clk/clk-fixed.c +++ b/drivers/clk/clk-fixed.c @@ -55,7 +55,6 @@ struct clk *clk_fixed(const char *name, int rate) return &fix->clk; } -#if defined(CONFIG_COMMON_CLK_OF_PROVIDER) /** * of_fixed_clk_setup() - Setup function for simple fixed rate clock */ @@ -76,4 +75,3 @@ static int of_fixed_clk_setup(struct device_node *node) return of_clk_add_provider(node, of_clk_src_simple_get, clk); } CLK_OF_DECLARE(fixed_clk, "fixed-clock", of_fixed_clk_setup); -#endif |