diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-26 12:00:49 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-26 12:00:49 -0300 |
| commit | cf2c310a0889cdeb0bc711e69833b77007717bcd (patch) | |
| tree | 58fd2d9677b13ab45ee7eecf8149effbd90f9215 /linux/drivers/media/video/saa7134/saa7134-video.c | |
| parent | b0674752e665f2b9f9b201c20341bdb326e881bb (diff) | |
| parent | 3a06e7be6db2c2b35e97a92b23c9191888a07042 (diff) | |
| download | mediapointer-dvb-s2-cf2c310a0889cdeb0bc711e69833b77007717bcd.tar.gz mediapointer-dvb-s2-cf2c310a0889cdeb0bc711e69833b77007717bcd.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-video.c')
| -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"); |