From 4421a8becd1b74336485be588a9bc84c579abcce Mon Sep 17 00:00:00 2001 From: Daniel Gimpelevich Date: Sat, 28 Jun 2008 01:45:26 -0300 Subject: [PATCH] --- yaml --- r: 103871 b: refs/heads/master c: bfda3a0b3276cda7f2da1dcd98bd060b60954cbb h: refs/heads/master i: 103869: 081fc33a6fbb9f9644d9650c610e093d8722f0ef 103867: f6b865eb15e1e1e2e3d077a9bba7a88f64d72935 103863: 0306157b63d4abb50fb55764f528946138a7907d 103855: 63a3103a86c079c7fd56714a67a248e237b001ae 103839: 3dd56e29d6ead405ac108d2a50b3d2d7a5eb98e3 103807: 1a502094f451d2d8fa5577fee73cf24fc7b34a72 v: v3 --- [refs] | 2 +- trunk/Documentation/video4linux/CARDLIST.saa7134 | 2 +- trunk/drivers/media/video/saa7134/saa7134-cards.c | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index aa82a310f729..4203df96409e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9fc52bcbeb5245b58d23c558f3e3e8f18bebbc3 +refs/heads/master: bfda3a0b3276cda7f2da1dcd98bd060b60954cbb diff --git a/trunk/Documentation/video4linux/CARDLIST.saa7134 b/trunk/Documentation/video4linux/CARDLIST.saa7134 index 4c8a86f24dbe..f58192276017 100644 --- a/trunk/Documentation/video4linux/CARDLIST.saa7134 +++ b/trunk/Documentation/video4linux/CARDLIST.saa7134 @@ -37,7 +37,7 @@ 36 -> UPMOST PURPLE TV [12ab:0800] 37 -> Items MuchTV Plus / IT-005 38 -> Terratec Cinergy 200 TV [153b:1152] - 39 -> LifeView FlyTV Platinum Mini [5168:0212,4e42:0212] + 39 -> LifeView FlyTV Platinum Mini [5168:0212,4e42:0212,5169:1502] 40 -> Compro VideoMate TV PVR/FM [185b:c100] 41 -> Compro VideoMate TV Gold+ [185b:c100] 42 -> Sabrent SBT-TVFM (saa7130) diff --git a/trunk/drivers/media/video/saa7134/saa7134-cards.c b/trunk/drivers/media/video/saa7134/saa7134-cards.c index a37e5c64f44b..348c8635f19f 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-cards.c +++ b/trunk/drivers/media/video/saa7134/saa7134-cards.c @@ -5368,6 +5368,12 @@ struct pci_device_id saa7134_pci_tbl[] = { .subvendor = 0x185b, .subdevice = 0xc900, .driver_data = SAA7134_BOARD_VIDEOMATE_T750, + }, { + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x5169, + .subdevice = 0x1502, + .driver_data = SAA7134_BOARD_FLYTVPLATINUM_MINI, }, { .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7133,