- Use less-generic name for saa7134 card #79

Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>

3 files changed, 11 insertions, 11 deletions

diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index b2ae80a2e..c6c03488f 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-cards.c,v 1.113 2005/11/05 02:49:20 rmcc Exp $
+ * $Id: saa7134-cards.c,v 1.114 2005/11/05 03:07:43 rmcc Exp $
  *
  * device driver for philips saa7134 based TV cards
  * card-specific stuff.
@@ -2454,11 +2454,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,
@@ -3106,7 +3106,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/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c
index cacb8eb73..76b888a48 100644
--- a/linux/drivers/media/video/saa7134/saa7134-input.c
+++ b/linux/drivers/media/video/saa7134/saa7134-input.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-input.c,v 1.39 2005/11/05 02:49:20 rmcc Exp $
+ * $Id: saa7134-input.c,v 1.40 2005/11/05 03:07:43 rmcc Exp $
  *
  * handle saa7134 IR remotes via linux kernel input layer.
  *
@@ -559,7 +559,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,
@@ -793,8 +793,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/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index efcd7a213..902dd5d67 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134.h,v 1.76 2005/11/05 02:49:20 rmcc Exp $
+ * $Id: saa7134.h,v 1.77 2005/11/05 03:07:43 rmcc Exp $
  *
  * v4l2 device driver for philips saa7134 based TV cards
  *
@@ -212,7 +212,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