Merge branches 'pm-core' and 'pm-domains'

[linux-2.6-block.git] / include / linux / sh_clk.h

diff --git a/include/linux/sh_clk.h b/include/linux/sh_clk.h
index 1f208b2a1ed63d4aa7e45a91cd12f666c3ae5612..645896b812448ed1e3a6874f57d2bd2f9d7100cf 100644 (file)
--- a/include/linux/sh_clk.h
+++ b/include/linux/sh_clk.h
@@ -113,10 +113,6 @@ long clk_rate_div_range_round(struct clk *clk, unsigned int div_min,
 long clk_rate_mult_range_round(struct clk *clk, unsigned int mult_min,
                               unsigned int mult_max, unsigned long rate);
 
-long clk_round_parent(struct clk *clk, unsigned long target,
-                     unsigned long *best_freq, unsigned long *parent_freq,
-                     unsigned int div_min, unsigned int div_max);
-
 #define SH_CLK_MSTP(_parent, _enable_reg, _enable_bit, _status_reg, _flags) \
 {                                                                      \
        .parent         = _parent,                                      \