aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-02-27 13:22:49 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-03-03 10:13:27 -0500
commit9a7871ba111862b1515719994df66eeda9debbd1 (patch)
tree70272b8681010e6ccf5df443a8211316d8208a5e
parentba52429cb4e9ccd2e6417205a3f7d1f78356e236 (diff)
V4L/DVB (3399): ELSA EX-VISION 500TV: fix incorrect PCI subsystem ID
- ELSA EX-VISION 500TV was incorrectly programmed to have the same subsystem ID as ELSA EX-VISION 300TV, (1048:226b) - This changeset replaces the incorrect subsystem ID (1048:226b) with the correct one (1048:226a) for the ELSA EX-VISION 500TV. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--Documentation/video4linux/CARDLIST.saa71342
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 8435a21856aa..17ea5a031b30 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -13,7 +13,7 @@
13 12 -> Medion 7134 [16be:0003] 13 12 -> Medion 7134 [16be:0003]
14 13 -> Typhoon TV+Radio 90031 14 13 -> Typhoon TV+Radio 90031
15 14 -> ELSA EX-VISION 300TV [1048:226b] 15 14 -> ELSA EX-VISION 300TV [1048:226b]
16 15 -> ELSA EX-VISION 500TV [1048:226b] 16 15 -> ELSA EX-VISION 500TV [1048:226a]
17 16 -> ASUS TV-FM 7134 [1043:4842,1043:4830,1043:4840] 17 16 -> ASUS TV-FM 7134 [1043:4842,1043:4830,1043:4840]
18 17 -> AOPEN VA1000 POWER [1131:7133] 18 17 -> AOPEN VA1000 POWER [1131:7133]
19 18 -> BMK MPEX No Tuner 19 18 -> BMK MPEX No Tuner
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 384f6f221e18..f156650960c2 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2882,7 +2882,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
2882 .vendor = PCI_VENDOR_ID_PHILIPS, 2882 .vendor = PCI_VENDOR_ID_PHILIPS,
2883 .device = PCI_DEVICE_ID_PHILIPS_SAA7130, 2883 .device = PCI_DEVICE_ID_PHILIPS_SAA7130,
2884 .subvendor = 0x1048, 2884 .subvendor = 0x1048,
2885 .subdevice = 0x226b, 2885 .subdevice = 0x226a,
2886 .driver_data = SAA7134_BOARD_ELSA_500TV, 2886 .driver_data = SAA7134_BOARD_ELSA_500TV,
2887 },{ 2887 },{
2888 .vendor = PCI_VENDOR_ID_PHILIPS, 2888 .vendor = PCI_VENDOR_ID_PHILIPS,