diff options
| author | root | 2009-03-24 23:04:25 +0100 |
|---|---|---|
| committer | Russell King | 2009-03-24 23:04:25 +0100 |
| commit | 9a38e989b8ce04923f919fc2a8a24eb07fb484e2 (patch) | |
| tree | 6b99638dc32b99420ada46ca8d1373ad7aa5a208 /arch/arm/mach-pxa/clock.h | |
| parent | Merge branch 'master' of git://git.marvell.com/orion into devel (diff) | |
| parent | MAINTAINERS: update pxa910 maintainers (diff) | |
| download | kernel-qcow2-linux-9a38e989b8ce04923f919fc2a8a24eb07fb484e2.tar.gz kernel-qcow2-linux-9a38e989b8ce04923f919fc2a8a24eb07fb484e2.tar.xz kernel-qcow2-linux-9a38e989b8ce04923f919fc2a8a24eb07fb484e2.zip | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
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 *); #endif void clks_register(struct clk_lookup *clks, size_t num); -int clk_add_alias(char *alias, struct device *alias_dev, char *id, +int clk_add_alias(const char *alias, const char *alias_name, char *id, struct device *dev); |