diff --git a/[refs] b/[refs] index 4f52ed1449f9..02850cc93bf3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b9886a173ff6c9ed528979c4d0a3566c1f61013 +refs/heads/master: 6781f4ae30bbb8ebf31187b3c9304be16966f5a0 diff --git a/trunk/kernel/resource.c b/trunk/kernel/resource.c index cf0a178c7513..03d796c1b2e9 100644 --- a/trunk/kernel/resource.c +++ b/trunk/kernel/resource.c @@ -438,7 +438,7 @@ int insert_resource(struct resource *parent, struct resource *new) /** * insert_resource_expand_to_fit - Insert a resource into the resource tree - * @parent: parent of the new resource + * @root: root resource descriptor * @new: new resource to insert * * Insert a resource into the resource tree, possibly expanding it in order