[PATCH] V4L: 914: use less generic name for saa7134 card 79

Use less-generic name for saa7134 card #79

Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 135fd59a6b20ff3b21f21c44a906b5e82cce1a14..663d03e5bc67331fced022c7143953e93d184adc 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2452,11 +2452,11 @@ struct saa7134_board saa7134_boards[] = {
                        .gpio = 0x0200000,
                },
        },
-       [SAA7134_BOARD_PCTV_CARDBUS] = {
+       [SAA7134_BOARD_SEDNA_PC_TV_CARDBUS] = {
                /* Paul Tom Zalac <pzalac@gmail.com> */
                /* Pavel Mihaylov <bin@bash.info> */
-               .name           = "PCTV Cardbus TV/Radio (ITO25 Rev:2B)",
-                               /* Sedna Cardbus TV Tuner */
+               .name           = "Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)",
+                               /* Sedna/MuchTV (OEM) Cardbus TV Tuner */
                .audio_clock    = 0x00187de7,
                .tuner_type     = TUNER_PHILIPS_TDA8290,
                .radio_type     = UNSET,
@@ -3067,7 +3067,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
        case SAA7134_BOARD_AVACSSMARTTV:
        case SAA7134_BOARD_GOTVIEW_7135:
        case SAA7134_BOARD_KWORLD_TERMINATOR:
-       case SAA7134_BOARD_PCTV_CARDBUS:
+       case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
                dev->has_remote = SAA7134_REMOTE_GPIO;
                break;
        case SAA7134_BOARD_MD5044:

diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index b792401712bae2ec1f4bc09437ab651a2068c969..329accda6d45a73774bf1bf28cd90c496e3f6582 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -546,7 +546,7 @@ static IR_KEYTAB_TYPE ir_codes_pinnacle[IR_KEYTAB_SIZE] = {
 /* Mapping for the 28 key remote control as seen at
    http://www.sednacomputer.com/photo/cardbus-tv.jpg
    Pavel Mihaylov <bin@bash.info> */
-static IR_KEYTAB_TYPE pctv_cardbus_codes[IR_KEYTAB_SIZE] = {
+static IR_KEYTAB_TYPE pctv_sedna_codes[IR_KEYTAB_SIZE] = {
        [    0 ] = KEY_KP0,
        [    1 ] = KEY_KP1,
        [    2 ] = KEY_KP2,
@@ -781,8 +781,8 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                mask_keyup   = 0x004000;
                polling      = 50; // ms
                break;
-       case SAA7134_BOARD_PCTV_CARDBUS:
-               ir_codes     = pctv_cardbus_codes;
+       case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
+               ir_codes     = pctv_sedna_codes;
                mask_keycode = 0x001f00;
                mask_keyup   = 0x004000;
                polling      = 50; // ms

diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 14a83b82ab234763822a8a125be75819eb5cf230..d993344d37e49e71aaf9aaf71a96ecbd5216d3d7 100644 (file)
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -205,7 +205,7 @@ struct saa7134_format {
 #define SAA7134_BOARD_MONSTERTV_MOBILE 76
 #define SAA7134_BOARD_PINNACLE_PCTV_110i 77
 #define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78
-#define SAA7134_BOARD_PCTV_CARDBUS     79
+#define SAA7134_BOARD_SEDNA_PC_TV_CARDBUS     79
 #define SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV 80
 #define SAA7134_BOARD_PHILIPS_TIGER  81