2 files changed, 16 insertions, 4 deletions

diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 8c7195455963..b76cc6ebf406 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -52,7 +52,7 @@
  51 -> ProVideo PV952                           [1540:9524]
  52 -> AverMedia AverTV/305                     [1461:2108]
  53 -> ASUS TV-FM 7135                          [1043:4845]
- 54 -> LifeView FlyTV Platinum FM               [5168:0214,1489:0214]
+ 54 -> LifeView FlyTV Platinum FM / Gold        [5168:0214,1489:0214,5168:0304]
  55 -> LifeView FlyDVB-T DUO                    [5168:0306]
  56 -> Avermedia AVerTV 307                     [1461:a70a]
  57 -> Avermedia AVerTV GO 007 FM               [1461:f31f]
@@ -84,7 +84,7 @@
  83 -> Terratec Cinergy 250 PCI TV              [153b:1160]
  84 -> LifeView FlyDVB Trio                     [5168:0319]
  85 -> AverTV DVB-T 777                         [1461:2c05]
- 86 -> LifeView FlyDVB-T                        [5168:0301]
+ 86 -> LifeView FlyDVB-T / Genius VideoWonder DVB-T [5168:0301,1489:0301]
  87 -> ADS Instant TV Duo Cardbus PTV331        [0331:1421]
  88 -> Tevion/KWorld DVB-T 220RF                [17de:7201]
  89 -> ELSA EX-VISION 700TV                     [1048:226c]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index fdd7f48f3b76..cae46a52bebb 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -208,7 +208,7 @@ struct saa7134_board saa7134_boards[] = {
         [SAA7134_BOARD_FLYTVPLATINUM_FM] = {
                 /* LifeView FlyTV Platinum FM (LR214WF) */
                 /* "Peter Missel <peter.missel@onlinehome.de> */
-                .name           = "LifeView FlyTV Platinum FM",
+                .name           = "LifeView FlyTV Platinum FM / Gold",
                 .audio_clock    = 0x00200000,
                 .tuner_type     = TUNER_PHILIPS_TDA8290,
                 .radio_type     = UNSET,
@@ -2671,7 +2671,7 @@ struct saa7134_board saa7134_boards[] = {
         [SAA7134_BOARD_FLYDVBT_LR301] = {
                 /* LifeView FlyDVB-T */
                 /* Giampiero Giancipoli <gianci@libero.it> */
-                .name           = "LifeView FlyDVB-T",
+                .name           = "LifeView FlyDVB-T / Genius VideoWonder DVB-T",
                 .audio_clock    = 0x00200000,
                 .tuner_type     = TUNER_ABSENT,
                 .radio_type     = UNSET,
@@ -3333,6 +3333,18 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subdevice    = 0x0005,
                 .driver_data  = SAA7134_BOARD_MD7134_BRIDGE_2,
         },{
+                .vendor = PCI_VENDOR_ID_PHILIPS,
+                .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
+                .subvendor = 0x1489,
+                .subdevice = 0x0301,
+                .driver_data = SAA7134_BOARD_FLYDVBT_LR301,
+        },{
+                .vendor = PCI_VENDOR_ID_PHILIPS,
+                .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor = 0x5168, /* Animation Technologies (LifeView) */
+                .subdevice = 0x0304,
+                .driver_data = SAA7134_BOARD_FLYTVPLATINUM_FM,
+        },{
                 /* --- boards without eeprom + subsystem ID --- */
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,