diff --git a/[refs] b/[refs] index f6cb8effa9f6..e59dd2d6b6e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af71100c7acf3ccaf95044cd5e9e866178e5f8a1 +refs/heads/master: 75c71848f22e6381f48614da23df2a43e374b498 diff --git a/trunk/drivers/of/pdt.c b/trunk/drivers/of/pdt.c index bc5b3990f6ed..07cc1d678e4d 100644 --- a/trunk/drivers/of/pdt.c +++ b/trunk/drivers/of/pdt.c @@ -229,7 +229,7 @@ static struct device_node * __init of_pdt_build_tree(struct device_node *parent, return ret; } -static void *kernel_tree_alloc(u64 size, u64 align) +static void * __init kernel_tree_alloc(u64 size, u64 align) { return prom_early_alloc(size); }