Merge branch 'devel'

This commit is contained in:
Russell King
2009-01-08 22:01:49 +00:00
committed by Russell King
2 changed files with 59 additions and 0 deletions

View File

@@ -32,6 +32,13 @@ unsigned int mem_fclk_21285 = 50000000;
EXPORT_SYMBOL(mem_fclk_21285);
static void __init early_fclk(char **arg)
{
mem_fclk_21285 = simple_strtoul(*arg, arg, 0);
}
__early_param("mem_fclk_21285=", early_fclk);
static int __init parse_tag_memclk(const struct tag *tag)
{
mem_fclk_21285 = tag->u.memclk.fmemclk;