diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-18 17:56:29 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-18 17:56:29 -0500 |
| commit | 37b797b270a81248f839629ddeb382a35c7b0d30 (patch) | |
| tree | b77e2126c5e15697901b6f96cdbbda38414d2850 /include | |
| parent | 1e74c891252941ac195bb47978f079c592271a3f (diff) | |
| parent | 30ff720b40ba64b0e9c8974673b95970e68503ac (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-omap/clock.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-arm/arch-omap/clock.h b/include/asm-arm/arch-omap/clock.h index 740c297eb11c..46a0402696de 100644 --- a/include/asm-arm/arch-omap/clock.h +++ b/include/asm-arm/arch-omap/clock.h | |||
| @@ -38,8 +38,6 @@ struct clk { | |||
| 38 | struct clk_functions { | 38 | struct clk_functions { |
| 39 | int (*clk_enable)(struct clk *clk); | 39 | int (*clk_enable)(struct clk *clk); |
| 40 | void (*clk_disable)(struct clk *clk); | 40 | void (*clk_disable)(struct clk *clk); |
| 41 | int (*clk_use)(struct clk *clk); | ||
| 42 | void (*clk_unuse)(struct clk *clk); | ||
| 43 | long (*clk_round_rate)(struct clk *clk, unsigned long rate); | 41 | long (*clk_round_rate)(struct clk *clk, unsigned long rate); |
| 44 | int (*clk_set_rate)(struct clk *clk, unsigned long rate); | 42 | int (*clk_set_rate)(struct clk *clk, unsigned long rate); |
| 45 | int (*clk_set_parent)(struct clk *clk, struct clk *parent); | 43 | int (*clk_set_parent)(struct clk *clk, struct clk *parent); |