---

yaml --- r: 320004 b: refs/heads/master c: 50fbe32 h: refs/heads/master v: v3
git-mirror · Jun 18, 2012 · f6fd96c · f6fd96c
1 parent 7857efa
commit f6fd96c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc3f906bce236bcf414285dca46550a73e2eaec8
+refs/heads/master: 50fbe32cf41a8309ed8016eb6f81232acfa23ae7
diff --git a/trunk/drivers/media/video/videobuf-dma-contig.c b/trunk/drivers/media/video/videobuf-dma-contig.c
@@ -40,7 +40,7 @@ struct videobuf_dma_contig_memory {
 
 static int __videobuf_dc_alloc(struct device *dev,
 			       struct videobuf_dma_contig_memory *mem,
-			       unsigned long size, unsigned long flags)
+			       unsigned long size, gfp_t flags)
 {
 	mem->size = size;
 	if (mem->cached) {