diff options
author | Greg Kroah-Hartman | 2011-11-27 04:46:19 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2011-11-27 04:46:48 +0100 |
commit | 47b649590dbbea182f854d6470ee1cd59b7b7684 (patch) | |
tree | a2de3610f9c5e963234cffb35b9d559aab62e164 /include/linux/sh_clk.h | |
parent | usb: Netlogic: Use CPU_XLR in place of NLM_XLR (diff) | |
parent | Linux 3.2-rc3 (diff) | |
download | kernel-qcow2-linux-47b649590dbbea182f854d6470ee1cd59b7b7684.tar.gz kernel-qcow2-linux-47b649590dbbea182f854d6470ee1cd59b7b7684.tar.xz kernel-qcow2-linux-47b649590dbbea182f854d6470ee1cd59b7b7684.zip |
Merge 3.2-rc3 into usb-linus
This pulls in the latest USB bugfixes and helps a few of the drivers
merge nicer in the future due to changes in both branches.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/sh_clk.h')
-rw-r--r-- | include/linux/sh_clk.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/sh_clk.h b/include/linux/sh_clk.h index 3ccf18648d0a..a20831cf336a 100644 --- a/include/linux/sh_clk.h +++ b/include/linux/sh_clk.h @@ -52,7 +52,6 @@ struct clk { unsigned long arch_flags; void *priv; - struct dentry *dentry; struct clk_mapping *mapping; struct cpufreq_frequency_table *freq_table; unsigned int nr_freqs; @@ -94,6 +93,9 @@ int clk_rate_table_find(struct clk *clk, long clk_rate_div_range_round(struct clk *clk, unsigned int div_min, unsigned int div_max, unsigned long rate); +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); |