summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bt8xx/bttv-driver.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-05-26 11:54:52 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-05-26 11:54:52 -0300
commitff1932a9bc2b54a130d135a19cc82e5c61130db0 (patch)
tree0350d144e0a90d6263fe5dfbb4630ec7b8d7f46b /linux/drivers/media/video/bt8xx/bttv-driver.c
parent17f89c4f89ca31ad9e0bb7630d9579371ee32e7f (diff)
parent3a0a7c3cc611b7e0981fea49e36822133337a9da (diff)
downloadmediapointer-dvb-s2-ff1932a9bc2b54a130d135a19cc82e5c61130db0.tar.gz
mediapointer-dvb-s2-ff1932a9bc2b54a130d135a19cc82e5c61130db0.tar.bz2
merge: http://linuxtv.org/hg/~anttip/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/bt8xx/bttv-driver.c')
-rw-r--r--linux/drivers/media/video/bt8xx/bttv-driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c
index 303422115..a836e0ed4 100644
--- a/linux/drivers/media/video/bt8xx/bttv-driver.c
+++ b/linux/drivers/media/video/bt8xx/bttv-driver.c
@@ -2654,7 +2654,7 @@ static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)
struct bttv_fh *fh = priv;
mutex_lock(&fh->cap.vb_lock);
- retval = videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize,
+ retval = __videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize,
V4L2_MEMORY_MMAP);
if (retval < 0) {
mutex_unlock(&fh->cap.vb_lock);