Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f3eec0c001a6781224d39912d41b58eaf2126586
Commit: f3eec0c001a6781224d39912d41b58eaf2126586
Parent: e06cea4cb4a16076dfca4863b12e1c4aeb781c8d
Author: Hartmut Hackmann <[EMAIL PROTECTED]>
AuthorDate: Wed Mar 14 20:33:55 2007 -0300
Committer: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Apr 27 15:44:52 2007 -0300
V4L/DVB (5446): Renamed ASUStek P7131 card [1043:4876]
The new name fits to what it is and what is on the box.
Signed-off-by: Hartmut Hackmann <[EMAIL PROTECTED]>
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
Documentation/video4linux/CARDLIST.saa7134 | 2 +-
drivers/media/video/saa7134/saa7134-cards.c | 10 +++++-----
drivers/media/video/saa7134/saa7134-dvb.c | 6 +++---
drivers/media/video/saa7134/saa7134.h | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Documentation/video4linux/CARDLIST.saa7134
b/Documentation/video4linux/CARDLIST.saa7134
index 1210b8b..d7bb2e2 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -110,4 +110,4 @@
109 -> Philips Tiger - S Reference design
110 -> Avermedia M102 [1461:f31e]
111 -> ASUS P7131 4871 [1043:4871]
-112 -> ASUSTeK P7131 Dual LNA [1043:4876]
+112 -> ASUSTeK P7131 Hybrid [1043:4876]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c
b/drivers/media/video/saa7134/saa7134-cards.c
index a700e89..e88fd7e 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -3369,8 +3369,8 @@ struct saa7134_board saa7134_boards[] = {
.gpio = 0x0200000,
}},
},
- [SAA7134_BOARD_ASUSTeK_P7131_DUAL_LNA] = {
- .name = "ASUSTeK P7131 Dual LNA",
+ [SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA] = {
+ .name = "ASUSTeK P7131 Hybrid",
.audio_clock = 0x00187de7,
.tuner_type = TUNER_PHILIPS_TDA8290,
.radio_type = UNSET,
@@ -4032,7 +4032,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
.subvendor = 0x1043,
.subdevice = 0x4876,
- .driver_data = SAA7134_BOARD_ASUSTeK_P7131_DUAL_LNA,
+ .driver_data = SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA,
},{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
@@ -4204,7 +4204,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
case SAA7134_BOARD_FLYDVBT_LR301:
case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
- case SAA7134_BOARD_ASUSTeK_P7131_DUAL_LNA:
+ case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:
case SAA7134_BOARD_FLYDVBTDUO:
case SAA7134_BOARD_PROTEUS_2309:
case SAA7134_BOARD_AVERMEDIA_A16AR:
@@ -4428,7 +4428,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
case SAA7134_BOARD_PINNACLE_PCTV_310i:
case SAA7134_BOARD_TEVION_DVBT_220RF:
case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
- case SAA7134_BOARD_ASUSTeK_P7131_DUAL_LNA:
+ case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:
case SAA7134_BOARD_MEDION_MD8800_QUADRO:
case SAA7134_BOARD_HAUPPAUGE_HVR1110:
/* this is a hybrid board, initialize to analog mode
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c
b/drivers/media/video/saa7134/saa7134-dvb.c
index f94754f..71c32b3 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -873,7 +873,7 @@ static struct tda1004x_config asus_p7131_4871_config = {
.request_firmware = philips_tda1004x_request_firmware
};
-static struct tda1004x_config asus_p7131_dual_lna_config = {
+static struct tda1004x_config asus_p7131_hybrid_lna_config = {
.demod_address = 0x08,
.invert = 1,
.invert_oclk = 0,
@@ -1153,8 +1153,8 @@ static int dvb_init(struct saa7134_dev *dev)
case SAA7134_BOARD_ASUS_P7131_4871:
configure_tda827x_fe(dev, &asus_p7131_4871_config);
break;
- case SAA7134_BOARD_ASUSTeK_P7131_DUAL_LNA:
- configure_tda827x_fe(dev, &asus_p7131_dual_lna_config);
+ case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:
+ configure_tda827x_fe(dev, &asus_p7131_hybrid_lna_config);
break;
default:
wprintk("Huh? unknown DVB card?\n");
diff --git a/drivers/media/video/saa7134/saa7134.h
b/drivers/media/video/saa7134/saa7134.h
index 0c88181..62224cc 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -234,7 +234,7 @@ struct saa7134_format {
#define SAA7134_BOARD_PHILIPS_TIGER_S 109
#define SAA7134_BOARD_AVERMEDIA_M102 110
#define SAA7134_BOARD_ASUS_P7131_4871 111
-#define SAA7134_BOARD_ASUSTeK_P7131_DUAL_LNA 112
+#define SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA 112
#define SAA7134_MAXBOARDS 8
#define SAA7134_INPUT_MAX 8
-
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
