diff options
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-driver.c | 30 | ||||
| -rw-r--r-- | v4l/versions.txt | 2 |
2 files changed, 1 insertions, 31 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c index 0c3a98955..7179f2d54 100644 --- a/linux/drivers/media/video/bt8xx/bttv-driver.c +++ b/linux/drivers/media/video/bt8xx/bttv-driver.c @@ -1495,15 +1495,6 @@ static int get_control(struct bttv *btv, struct v4l2_control *c) case V4L2_CID_AUDIO_VOLUME: c->value = va.volume; break; - case V4L2_CID_AUDIO_BALANCE: - c->value = va.balance; - break; - case V4L2_CID_AUDIO_BASS: - c->value = va.bass; - break; - case V4L2_CID_AUDIO_TREBLE: - c->value = va.treble; - break; } return 0; } @@ -1598,15 +1589,6 @@ static int set_control(struct bttv *btv, struct v4l2_control *c) case V4L2_CID_AUDIO_VOLUME: va.volume = c->value; break; - case V4L2_CID_AUDIO_BALANCE: - va.balance = c->value; - break; - case V4L2_CID_AUDIO_BASS: - va.bass = c->value; - break; - case V4L2_CID_AUDIO_TREBLE: - va.treble = c->value; - break; } btv->audio_hook(btv,&va,1); return 0; @@ -2942,18 +2924,6 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, if (!(va.flags & VIDEO_AUDIO_VOLUME)) *c = no_ctl; break; - case V4L2_CID_AUDIO_BALANCE: - if (!(va.flags & VIDEO_AUDIO_BALANCE)) - *c = no_ctl; - break; - case V4L2_CID_AUDIO_BASS: - if (!(va.flags & VIDEO_AUDIO_BASS)) - *c = no_ctl; - break; - case V4L2_CID_AUDIO_TREBLE: - if (!(va.flags & VIDEO_AUDIO_TREBLE)) - *c = no_ctl; - break; } } #endif diff --git a/v4l/versions.txt b/v4l/versions.txt index 2b6f9f8d0..80d3493f3 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -58,7 +58,7 @@ VIDEO_PVRUSB2_SYSFS VIDEO_PVRUSB2_DEBUGIFC VIDEO_USBVISION -[2.6.12] +[2.6.11] VIDEO_VIVI VIDEO_DEV VIDEO_V4L1 |