diff --git a/[refs] b/[refs] index 5934f9aae44a..179428e9538a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3860c1c5dd1137db23d7786d284939c5761d517 +refs/heads/master: ee5e5683d8ac3fec876cb6c26792212f773d5898 diff --git a/trunk/kernel/resource.c b/trunk/kernel/resource.c index 7e8ea66a8c01..e1d2b8ee76d5 100644 --- a/trunk/kernel/resource.c +++ b/trunk/kernel/resource.c @@ -515,8 +515,8 @@ int reallocate_resource(struct resource *root, struct resource *old, * @root: root resource descriptor * @new: resource descriptor desired by caller * @size: requested resource region size - * @min: minimum size to allocate - * @max: maximum size to allocate + * @min: minimum boundary to allocate + * @max: maximum boundary to allocate * @align: alignment requested, in bytes * @alignf: alignment function, optional, called if not NULL * @alignf_data: arbitrary data to pass to the @alignf function