From b2af21aaff36b3613ee953b50d20c6586ee3d0fc Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Mon, 27 Feb 2006 14:38:17 -0300 Subject: [PATCH] --- yaml --- r: 21691 b: refs/heads/master c: ba52429cb4e9ccd2e6417205a3f7d1f78356e236 h: refs/heads/master i: 21689: 2bdc42731c563db226167696c58cef86a6c8319a 21687: b27d413f71b9c0bc1b19bfce8ec02a5b718dd1a9 v: v3 --- [refs] | 2 +- trunk/Documentation/video4linux/CARDLIST.saa7134 | 2 +- trunk/drivers/media/video/saa7134/saa7134-cards.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 53934d685519..3f541765387e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 420f32fe4e3eed466a6563e15a89f4688134cc98 +refs/heads/master: ba52429cb4e9ccd2e6417205a3f7d1f78356e236 diff --git a/trunk/Documentation/video4linux/CARDLIST.saa7134 b/trunk/Documentation/video4linux/CARDLIST.saa7134 index e1484dfef103..8435a21856aa 100644 --- a/trunk/Documentation/video4linux/CARDLIST.saa7134 +++ b/trunk/Documentation/video4linux/CARDLIST.saa7134 @@ -87,5 +87,5 @@ 86 -> LifeView FlyDVB-T [5168:0301] 87 -> ADS Instant TV Duo Cardbus PTV331 [0331:1421] 88 -> Tevion DVB-T 220RF [17de:7201] - 89 -> ELSA EX-VISION 700TV [1131:7130] + 89 -> ELSA EX-VISION 700TV [1048:226c] 90 -> Kworld ATSC110 [17de:7350] diff --git a/trunk/drivers/media/video/saa7134/saa7134-cards.c b/trunk/drivers/media/video/saa7134/saa7134-cards.c index 288d1f8841be..384f6f221e18 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-cards.c +++ b/trunk/drivers/media/video/saa7134/saa7134-cards.c @@ -2887,8 +2887,8 @@ struct pci_device_id saa7134_pci_tbl[] = { },{ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7130, - .subvendor = 0x1131, - .subdevice = 0x7130, + .subvendor = 0x1048, + .subdevice = 0x226c, .driver_data = SAA7134_BOARD_ELSA_700TV, },{ .vendor = PCI_VENDOR_ID_PHILIPS,