diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:09:41 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:09:41 +0000 |
| commit | 2741ecb4ce5c2d430b5c44b0a169038338c21df5 (patch) | |
| tree | 4aa71d7551184ee88f32c7f3660d821133058c32 /arch/arm/mach-footbridge | |
| parent | bc85e585c6d0fab4bde12d60964b2f25802c3163 (diff) | |
| parent | 5de813b6cd06460b337f9da9afe316823cf3ef45 (diff) | |
Merge branch 'misc2' into devel
Diffstat (limited to 'arch/arm/mach-footbridge')
| -rw-r--r-- | arch/arm/mach-footbridge/common.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-footbridge/common.c b/arch/arm/mach-footbridge/common.c index 41febc796b1..e3bc3f6f6b1 100644 --- a/arch/arm/mach-footbridge/common.c +++ b/arch/arm/mach-footbridge/common.c @@ -32,12 +32,13 @@ unsigned int mem_fclk_21285 = 50000000; EXPORT_SYMBOL(mem_fclk_21285); -static void __init early_fclk(char **arg) +static int __init early_fclk(char *arg) { - mem_fclk_21285 = simple_strtoul(*arg, arg, 0); + mem_fclk_21285 = simple_strtoul(arg, NULL, 0); + return 0; } -__early_param("mem_fclk_21285=", early_fclk); +early_param("mem_fclk_21285", early_fclk); static int __init parse_tag_memclk(const struct tag *tag) { |