Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f438d97447d4ccd241db8477f62a0647b9e8220e
Commit:     f438d97447d4ccd241db8477f62a0647b9e8220e
Parent:     0e789d7ffafbfd44f7fb2bdbf1138547d8abc231
Author:     Stas Sergeev <[EMAIL PROTECTED]>
AuthorDate: Mon Sep 17 15:34:09 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 22:14:45 2007 -0300

    V4L/DVB (6225): AverTV Studio 307 has only one composite input
    
    AverTV Studio 307 has only one composite input.
    
    Signed-off-by: Stas Sergeev <[EMAIL PROTECTED]>
    Acked-by: Nickolay V. Shmyrev <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/saa7134/saa7134-cards.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/media/video/saa7134/saa7134-cards.c 
b/drivers/media/video/saa7134/saa7134-cards.c
index c4dc986..6b6eae8 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -32,6 +32,7 @@ static char name_mute[]    = "mute";
 static char name_radio[]   = "Radio";
 static char name_tv[]      = "Television";
 static char name_tv_mono[] = "TV (mono only)";
+static char name_comp[]    = "Composite";
 static char name_comp1[]   = "Composite1";
 static char name_comp2[]   = "Composite2";
 static char name_comp3[]   = "Composite3";
@@ -1535,12 +1536,7 @@ struct saa7134_board saa7134_boards[] = {
                        .tv   = 1,
                        .gpio = 0x00,
                },{
-                       .name = name_comp1,
-                       .vmux = 0,
-                       .amux = LINE1,
-                       .gpio = 0x02,
-               },{
-                       .name = name_comp2,
+                       .name = name_comp,
                        .vmux = 3,
                        .amux = LINE1,
                        .gpio = 0x02,
-
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

Reply via email to