diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-23 12:42:30 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-23 12:42:30 -0400 |
| commit | dc85ce155b7cad4c39c1fc95b4f6281920cef3c8 (patch) | |
| tree | 5b7b353f9dbd6590493eb33f405e4ac8524b90e0 /arch/arm/mach-pxa/clock.h | |
| parent | 4731f8b66dd34ebf0e67ca6ba9162b0e509bec06 (diff) | |
| parent | 1efb71809fd47bc19b3ce05080e1d5085a8dfab1 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/clock.h')
| -rw-r--r-- | arch/arm/mach-pxa/clock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/clock.h b/arch/arm/mach-pxa/clock.h index 4e9c613c6767..5599bceff738 100644 --- a/arch/arm/mach-pxa/clock.h +++ b/arch/arm/mach-pxa/clock.h | |||
| @@ -69,6 +69,6 @@ extern void clk_pxa3xx_cken_disable(struct clk *); | |||
| 69 | #endif | 69 | #endif |
| 70 | 70 | ||
| 71 | void clks_register(struct clk_lookup *clks, size_t num); | 71 | void clks_register(struct clk_lookup *clks, size_t num); |
| 72 | int clk_add_alias(char *alias, struct device *alias_dev, char *id, | 72 | int clk_add_alias(const char *alias, const char *alias_name, char *id, |
| 73 | struct device *dev); | 73 | struct device *dev); |
| 74 | 74 | ||