Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-block.git] / kernel / resource.c

diff --git a/kernel/resource.c b/kernel/resource.c
index ca6a1536b205bf6b0271fa7d6fb92ea09f87b649..fd5d7d574bb96fe857818d32cfee8dde1a755540 100644 (file)
--- 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,