Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17ce1ff9 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Linus Torvalds
Browse files

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



Use less-generic name for saa7134 card #79

Signed-off-by: default avatarRicardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent cb2444df

drivers/media/video/saa7134/saa7134-cards.c

+4 −4
Original line number Diff line number Diff line
@@ -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:

drivers/media/video/saa7134/saa7134-input.c

+3 −3
Original line number Diff line number Diff line
@@ -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

drivers/media/video/saa7134/saa7134.h

+1 −1
Original line number Diff line number Diff line
@@ -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