From 5848807bd8ae21558a7f1ca88f2ef85f1065fb4c Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Thu, 15 Jan 2009 13:51:01 -0800 Subject: [PATCH] --- yaml --- r: 129673 b: refs/heads/master c: 6ae301e85c9c58d2f430a8a7057ce488b7ff76df h: refs/heads/master i: 129671: 9d9a498f1a4be8a5d9d164078073c66d8b9421e3 v: v3 --- [refs] | 2 +- trunk/include/linux/ioport.h | 3 ++- trunk/kernel/resource.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 08eceb8a3da4..3852e3d8e178 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3eabdb76a03bbe8f556162738c264dbfb24cff6a +refs/heads/master: 6ae301e85c9c58d2f430a8a7057ce488b7ff76df diff --git a/trunk/include/linux/ioport.h b/trunk/include/linux/ioport.h index f6bb2ca8e3ba..32e4b2f72294 100644 --- a/trunk/include/linux/ioport.h +++ b/trunk/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/trunk/kernel/resource.c b/trunk/kernel/resource.c index ca6a1536b205..fd5d7d574bb9 100644 --- a/trunk/kernel/resource.c +++ b/trunk/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,