diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-29 10:40:34 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-29 10:40:34 +0200 |
| commit | 13223cb02ccfa375f2d683d08d30db5b72264f1e (patch) | |
| tree | d3fc7d803d22bbfe03b96cf0ba38041d42c8a1c2 /arch/arm/mach-pxa/clock.h | |
| parent | tg3: Add GRO support. (diff) | |
| parent | Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 (diff) | |
| download | linux-13223cb02ccfa375f2d683d08d30db5b72264f1e.tar.xz linux-13223cb02ccfa375f2d683d08d30db5b72264f1e.zip | |
Merge branch 'master' of /home/davem/src/GIT/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 *); #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); |