Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream

This commit is contained in:
Russell King 2006-01-18 22:56:29 +00:00 • committed by Russell King
commit 37b797b270
12 changed files with 152 additions and 189 deletions

View file

@ -38,8 +38,6 @@ struct clk {
struct clk_functions {
int (*clk_enable)(struct clk *clk);
void (*clk_disable)(struct clk *clk);
int (*clk_use)(struct clk *clk);
void (*clk_unuse)(struct clk *clk);
long (*clk_round_rate)(struct clk *clk, unsigned long rate);
int (*clk_set_rate)(struct clk *clk, unsigned long rate);
int (*clk_set_parent)(struct clk *clk, struct clk *parent);