summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2009-01-15 13:51:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-15 16:39:38 -0800
commit6ae301e85c9c58d2f430a8a7057ce488b7ff76df (patch)
tree473a5da20df4868b13c2d4cadb2ce3804f548069
parent3eabdb76a03bbe8f556162738c264dbfb24cff6a (diff)
downloadlinux-3.10-6ae301e85c9c58d2f430a8a7057ce488b7ff76df.tar.gz
linux-3.10-6ae301e85c9c58d2f430a8a7057ce488b7ff76df.tar.bz2
linux-3.10-6ae301e85c9c58d2f430a8a7057ce488b7ff76df.zip
resources: fix parameter name and kernel-doc
Fix __request_region() parameter kernel-doc notation and parameter name: Warning(linux-2.6.28-git10//kernel/resource.c:627): No description found for parameter 'flags' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/ioport.h3
-rw-r--r--kernel/resource.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index f6bb2ca8e3b..32e4b2f7229 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -143,7 +143,8 @@ static inline unsigned long resource_type(struct resource *res)
extern struct resource * __request_region(struct resource *,
resource_size_t start,
- resource_size_t n, const char *name, int relaxed);
+ resource_size_t n,
+ const char *name, int flags);
/* Compatibility cruft */
#define release_region(start,n) __release_region(&ioport_resource, (start), (n))
diff --git a/kernel/resource.c b/kernel/resource.c
index ca6a1536b20..fd5d7d574bb 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -620,6 +620,7 @@ resource_size_t resource_alignment(struct resource *res)
* @start: resource start address
* @n: resource region size
* @name: reserving caller's ID string
+ * @flags: IO resource flags
*/
struct resource * __request_region(struct resource *parent,
resource_size_t start, resource_size_t n,