diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-26 11:55:24 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-26 11:55:24 -0300 |
| commit | 3a06e7be6db2c2b35e97a92b23c9191888a07042 (patch) | |
| tree | 528aeb42700f9199d79e1b20dba205d74933b355 /linux/drivers/media/video/saa7134 | |
| parent | 6c704b27377af4d7802223b3e7a7ec4f154fb158 (diff) | |
| parent | ff1932a9bc2b54a130d135a19cc82e5c61130db0 (diff) | |
| download | mediapointer-dvb-s2-3a06e7be6db2c2b35e97a92b23c9191888a07042.tar.gz mediapointer-dvb-s2-3a06e7be6db2c2b35e97a92b23c9191888a07042.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/cleanups
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c index 3b7774305..b8444429a 100644 --- a/linux/drivers/media/video/saa7134/saa7134-video.c +++ b/linux/drivers/media/video/saa7134/saa7134-video.c @@ -1641,7 +1641,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"); |