aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <v4l@cerqueira.org>2005-11-09 00:38:47 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:31 -0500
commit17ce1ff9cfd90ab3ecffaa5ebfb4abbf8216f2cc (patch)
tree4b06666fc245d5376183ad5c123cbb0bba74543c
parentcb2444dfa203b5b5c76d63c0ce8593e4e0385719 (diff)
[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>
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c8
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c6
-rw-r--r--drivers/media/video/saa7134/saa7134.h2
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 135fd59a6b20..663d03e5bc67 100644
--- 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[] = {
2452 .gpio = 0x0200000, 2452 .gpio = 0x0200000,
2453 }, 2453 },
2454 }, 2454 },
2455 [SAA7134_BOARD_PCTV_CARDBUS] = { 2455 [SAA7134_BOARD_SEDNA_PC_TV_CARDBUS] = {
2456 /* Paul Tom Zalac <pzalac@gmail.com> */ 2456 /* Paul Tom Zalac <pzalac@gmail.com> */
2457 /* Pavel Mihaylov <bin@bash.info> */ 2457 /* Pavel Mihaylov <bin@bash.info> */
2458 .name = "PCTV Cardbus TV/Radio (ITO25 Rev:2B)", 2458 .name = "Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)",
2459 /* Sedna Cardbus TV Tuner */ 2459 /* Sedna/MuchTV (OEM) Cardbus TV Tuner */
2460 .audio_clock = 0x00187de7, 2460 .audio_clock = 0x00187de7,
2461 .tuner_type = TUNER_PHILIPS_TDA8290, 2461 .tuner_type = TUNER_PHILIPS_TDA8290,
2462 .radio_type = UNSET, 2462 .radio_type = UNSET,
@@ -3067,7 +3067,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
3067 case SAA7134_BOARD_AVACSSMARTTV: 3067 case SAA7134_BOARD_AVACSSMARTTV:
3068 case SAA7134_BOARD_GOTVIEW_7135: 3068 case SAA7134_BOARD_GOTVIEW_7135:
3069 case SAA7134_BOARD_KWORLD_TERMINATOR: 3069 case SAA7134_BOARD_KWORLD_TERMINATOR:
3070 case SAA7134_BOARD_PCTV_CARDBUS: 3070 case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
3071 dev->has_remote = SAA7134_REMOTE_GPIO; 3071 dev->has_remote = SAA7134_REMOTE_GPIO;
3072 break; 3072 break;
3073 case SAA7134_BOARD_MD5044: 3073 case SAA7134_BOARD_MD5044:
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index b792401712ba..329accda6d45 100644
--- 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] = {
546/* Mapping for the 28 key remote control as seen at 546/* Mapping for the 28 key remote control as seen at
547 http://www.sednacomputer.com/photo/cardbus-tv.jpg 547 http://www.sednacomputer.com/photo/cardbus-tv.jpg
548 Pavel Mihaylov <bin@bash.info> */ 548 Pavel Mihaylov <bin@bash.info> */
549static IR_KEYTAB_TYPE pctv_cardbus_codes[IR_KEYTAB_SIZE] = { 549static IR_KEYTAB_TYPE pctv_sedna_codes[IR_KEYTAB_SIZE] = {
550 [ 0 ] = KEY_KP0, 550 [ 0 ] = KEY_KP0,
551 [ 1 ] = KEY_KP1, 551 [ 1 ] = KEY_KP1,
552 [ 2 ] = KEY_KP2, 552 [ 2 ] = KEY_KP2,
@@ -781,8 +781,8 @@ int saa7134_input_init1(struct saa7134_dev *dev)
781 mask_keyup = 0x004000; 781 mask_keyup = 0x004000;
782 polling = 50; // ms 782 polling = 50; // ms
783 break; 783 break;
784 case SAA7134_BOARD_PCTV_CARDBUS: 784 case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
785 ir_codes = pctv_cardbus_codes; 785 ir_codes = pctv_sedna_codes;
786 mask_keycode = 0x001f00; 786 mask_keycode = 0x001f00;
787 mask_keyup = 0x004000; 787 mask_keyup = 0x004000;
788 polling = 50; // ms 788 polling = 50; // ms
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 14a83b82ab23..d993344d37e4 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -205,7 +205,7 @@ struct saa7134_format {
205#define SAA7134_BOARD_MONSTERTV_MOBILE 76 205#define SAA7134_BOARD_MONSTERTV_MOBILE 76
206#define SAA7134_BOARD_PINNACLE_PCTV_110i 77 206#define SAA7134_BOARD_PINNACLE_PCTV_110i 77
207#define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78 207#define SAA7134_BOARD_ASUSTeK_P7131_DUAL 78
208#define SAA7134_BOARD_PCTV_CARDBUS 79 208#define SAA7134_BOARD_SEDNA_PC_TV_CARDBUS 79
209#define SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV 80 209#define SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV 80
210#define SAA7134_BOARD_PHILIPS_TIGER 81 210#define SAA7134_BOARD_PHILIPS_TIGER 81
211 211