summaryrefslogtreecommitdiffstats
path: root/Documentation/video4linux
diff options
context:
space:
mode:
authorGlen Gray <glen@lincor.com>2005-11-08 21:36:12 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:06 -0800
commit2d14f78e4bfa55e5a534cc4c03ddab8841a1b32e (patch)
tree64c02875395c4a8f52c7944b9bc90486da39d61a /Documentation/video4linux
parentcc952d03c0c36ec9a4c2a683015dbb98e8a889df (diff)
downloadop-kernel-dev-2d14f78e4bfa55e5a534cc4c03ddab8841a1b32e.zip
op-kernel-dev-2d14f78e4bfa55e5a534cc4c03ddab8841a1b32e.tar.gz
[PATCH] v4l: 627: added support for oem version of flytv platinum mini with a
- Added support for OEM version of FlyTV Platinum mini with a subvendor id of 0x4e42. - Added the OEM PCI id's to the docs/CARDLIST.saa7134 for item 39 - Modified the vmux in the SAA7134_BOARD_FLYTVPLATINUM_MINI driver data from 0 (Composite over S-Video) to 3 (Composite). Signed-off-by: Glen Gray <glen@lincor.com> Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/video4linux')
-rw-r--r--Documentation/video4linux/CARDLIST.saa71342
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index dc57225..33b6cf9 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/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]
+ 39 -> LifeView FlyTV Platinum Mini [5168:0212,4e42:0212]
40 -> Compro VideoMate TV PVR/FM [185b:c100]
41 -> Compro VideoMate TV Gold+ [185b:c100]
42 -> Sabrent SBT-TVFM (saa7130)
OpenPOWER on IntegriCloud