[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>

1 files changed, 11 insertions, 1 deletions

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index acc7a4335e23..a67a0a11c6db 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -191,10 +191,14 @@ struct saa7134_board saa7134_boards[] = {
                         .amux = TV,
                         .tv   = 1,
                 },{
-                        .name = name_comp1,
+                        .name = name_comp1,     /* Composite signal on S-Video input */
                         .vmux = 0,
                         .amux = LINE2,
                 },{
+                        .name = name_comp2,     /* Composite input */
+                        .vmux = 3,
+                        .amux = LINE2,
+                },{
                         .name = name_svideo,
                         .vmux = 8,
                         .amux = LINE2,
@@ -2193,6 +2197,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x4e42,
+                .subdevice    = 0x0212, /* OEM minipci, LR212 */
+                .driver_data  = SAA7134_BOARD_FLYTVPLATINUM_MINI,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                 .subvendor    = 0x5168, /* Animation Technologies (LifeView) */
                 .subdevice    = 0x0214, /* Standard PCI, LR214WF */
                 .driver_data  = SAA7134_BOARD_FLYTVPLATINUM_FM,