---

yaml --- r: 96131 b: refs/heads/master c: a8b1ecf h: refs/heads/master i: 96129: ad03ad9 96127: be75440 v: v3
git-mirror · May 8, 2008 · bb12e24 · bb12e24
1 parent a4d98e7
commit bb12e24
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: a1f2aa1be2f7a6883ba46faa53ed82595dee2a06
+refs/heads/master: a8b1ecf3d5c48ebde9fed61c7a682b2270e09d2b
diff --git a/trunk/drivers/media/video/saa7134/saa7134-video.c b/trunk/drivers/media/video/saa7134/saa7134-video.c
@@ -1634,7 +1634,7 @@ static int saa7134_s_fmt_overlay(struct file *file, void *priv,
 	struct saa7134_fh *fh = priv;
 	struct saa7134_dev *dev = fh->dev;
 	int err;
-	unsigned int flags;
+	unsigned long flags;
 
 	if (saa7134_no_overlay > 0) {
 		printk(KERN_ERR "V4L2_BUF_TYPE_VIDEO_OVERLAY: no_overlay\n");