git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
media
/
common
/
saa7146_video.c
diff --git
a/drivers/media/common/saa7146_video.c
b/drivers/media/common/saa7146_video.c
index
e7079d1
..
7e0cedc
100644
(file)
--- a/
drivers/media/common/saa7146_video.c
+++ b/
drivers/media/common/saa7146_video.c
@@
-318,6
+318,7
@@
int saa7146_start_preview(struct saa7146_fh *fh)
return 0;
}
return 0;
}
+EXPORT_SYMBOL_GPL(saa7146_start_preview);
int saa7146_stop_preview(struct saa7146_fh *fh)
{
int saa7146_stop_preview(struct saa7146_fh *fh)
{
@@
-352,6
+353,7
@@
int saa7146_stop_preview(struct saa7146_fh *fh)
return 0;
}
return 0;
}
+EXPORT_SYMBOL_GPL(saa7146_stop_preview);
static int s_fmt(struct saa7146_fh *fh, struct v4l2_format *f)
{
static int s_fmt(struct saa7146_fh *fh, struct v4l2_format *f)
{
@@
-1188,6
+1190,7
@@
int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
}
return err;
}
}
return err;
}
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
case VIDIOCGMBUF:
{
struct video_mbuf *mbuf = arg;
case VIDIOCGMBUF:
{
struct video_mbuf *mbuf = arg;
@@
-1216,6
+1219,7
@@
int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
mutex_unlock(&q->lock);
return 0;
}
mutex_unlock(&q->lock);
return 0;
}
+#endif
default:
return v4l_compat_translate_ioctl(inode,file,cmd,arg,
saa7146_video_do_ioctl);
default:
return v4l_compat_translate_ioctl(inode,file,cmd,arg,
saa7146_video_do_ioctl);