---

yaml --- r: 129673 b: refs/heads/master c: 6ae301e h: refs/heads/master i: 129671: 9d9a498 v: v3
git-mirror · Jan 16, 2009 · 5848807 · 5848807
1 parent 120cfc3
commit 5848807
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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,