summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-08-25 16:52:54 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-08-25 16:52:54 -0300
commita85302f51c025ddce51d02af80e11649d0830a0a (patch)
treed4a6cea320c1967fc5f125fdaa3b9729667d01a4 /linux/drivers
parent19388b4b929315e487572fdd1ed7bc071ac7bea9 (diff)
downloadmediapointer-dvb-s2-a85302f51c025ddce51d02af80e11649d0830a0a.tar.gz
mediapointer-dvb-s2-a85302f51c025ddce51d02af80e11649d0830a0a.tar.bz2
Cleanup: Removed obsoleted code from bttv-cards
From: Nickolay V. Shmyrev <nshmyrev@yandex.ru> This is part of the old V4L1->V4L2 bttv patch, ported to current tree by Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> --- linux/drivers/media/video/bt8xx/bttv-cards.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/bt8xx/bttv-cards.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c
index c697cb686..c45c0e9ae 100644
--- a/linux/drivers/media/video/bt8xx/bttv-cards.c
+++ b/linux/drivers/media/video/bt8xx/bttv-cards.c
@@ -4501,13 +4501,8 @@ gvbctv5pci_audio(struct bttv *btv, struct video_audio *v, int set)
{
unsigned int val, con;
-#if BTTV_VERSION_CODE > KERNEL_VERSION(0,8,0)
if (btv->radio_user)
return;
-#else
- if (btv->radio)
- return;
-#endif
val = gpio_read();
if (set) {
@@ -4696,13 +4691,8 @@ pvbt878p9b_audio(struct bttv *btv, struct video_audio *v, int set)
{
unsigned int val = 0;
-#if BTTV_VERSION_CODE > KERNEL_VERSION(0,8,0)
if (btv->radio_user)
return;
-#else
- if (btv->radio)
- return;
-#endif
if (set) {
if (v->mode & VIDEO_SOUND_MONO) {
@@ -4733,13 +4723,9 @@ fv2000s_audio(struct bttv *btv, struct video_audio *v, int set)
{
unsigned int val = 0xffff;
-#if BTTV_VERSION_CODE > KERNEL_VERSION(0,8,0)
if (btv->radio_user)
return;
-#else
- if (btv->radio)
- return;
-#endif
+
if (set) {
if (v->mode & VIDEO_SOUND_MONO) {
val = 0x0000;