Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5b261016f04eb5df1e1e652794f1f4d7dd072566
Commit: 5b261016f04eb5df1e1e652794f1f4d7dd072566
Parent: c2806d03c090a1bf9c8c94bbecb92242b57469f3
Author: Nickolay V. Shmyrev <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 25 16:53:02 2006 -0300
Committer: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Jan 25 19:00:58 2008 -0200
V4L/DVB (6413): Forward VIDIOCGAUDIO and VIDIOCSAUDIO through v4l1-compat
Signed-off-by: Nickolay V. Shmyrev <[EMAIL PROTECTED]>
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
drivers/media/video/bt8xx/bttv-driver.c | 41 -------------------------------
1 files changed, 0 insertions(+), 41 deletions(-)
diff --git a/drivers/media/video/bt8xx/bttv-driver.c
b/drivers/media/video/bt8xx/bttv-driver.c
index 061f52b..2cdbac3 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -1891,47 +1891,6 @@ static struct videobuf_queue_ops bttv_video_qops = {
static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
{
switch (cmd) {
-#ifdef CONFIG_VIDEO_V4L1
- case VIDIOCGAUDIO:
- {
- struct video_audio *v = arg;
-
- memset(v,0,sizeof(*v));
- strcpy(v->name,"Television");
- v->flags |= VIDEO_AUDIO_MUTABLE;
- v->mode = VIDEO_SOUND_MONO;
-
- mutex_lock(&btv->lock);
- bttv_call_i2c_clients(btv,cmd,v);
-
- /* card specific hooks */
- if (btv->audio_hook)
- btv->audio_hook(btv,v,0);
-
- mutex_unlock(&btv->lock);
- return 0;
- }
- case VIDIOCSAUDIO:
- {
- struct video_audio *v = arg;
- unsigned int audio = v->audio;
-
- if (audio >= bttv_tvcards[btv->c.type].audio_inputs)
- return -EINVAL;
-
- mutex_lock(&btv->lock);
- audio_mute(btv, (v->flags&VIDEO_AUDIO_MUTE) ? 1 : 0);
- bttv_call_i2c_clients(btv,cmd,v);
-
- /* card specific hooks */
- if (btv->audio_hook)
- btv->audio_hook(btv,v,1);
-
- mutex_unlock(&btv->lock);
- return 0;
- }
-#endif
- /* *** v4l2 *** ************************************************ */
case VIDIOC_ENUMSTD:
{
struct v4l2_standard *e = arg;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
