Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=db4836791dc578f0f6e9573468cffeee00fa7ebc
Commit:     db4836791dc578f0f6e9573468cffeee00fa7ebc
Parent:     e95d317da2de7116ef66fa16bd9664cd39f1c11c
Author:     Peter Missel <[EMAIL PROTECTED]>
AuthorDate: Fri Apr 27 12:31:20 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Apr 27 15:43:44 2007 -0300

    V4L/DVB (5331): Identify MSI [EMAIL PROTECTED] Duo
    
    It is a Lifeview Duo with a different ID
    
    Signed-off-by: Peter Missel <[EMAIL PROTECTED]>
    Signed-off-by: Hartmut Hackmann <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 Documentation/video4linux/CARDLIST.saa7134  |    2 +-
 drivers/media/video/saa7134/saa7134-cards.c |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Documentation/video4linux/CARDLIST.saa7134 
b/Documentation/video4linux/CARDLIST.saa7134
index 51f8a3f..9cbb048 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -53,7 +53,7 @@
  52 -> AverMedia AverTV/305                     [1461:2108]
  53 -> ASUS TV-FM 7135                          [1043:4845]
  54 -> LifeView FlyTV Platinum FM / Gold        [5168:0214,1489:0214,5168:0304]
- 55 -> LifeView FlyDVB-T DUO                    [5168:0306]
+ 55 -> LifeView FlyDVB-T DUO / MSI [EMAIL PROTECTED] Duo [5168:0306,4E42:0306]
  56 -> Avermedia AVerTV 307                     [1461:a70a]
  57 -> Avermedia AVerTV GO 007 FM               [1461:f31f]
  58 -> ADS Tech Instant TV (saa7135)            
[1421:0350,1421:0351,1421:0370,1421:1370]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c 
b/drivers/media/video/saa7134/saa7134-cards.c
index 23cd5f6..7572e93 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -1778,7 +1778,7 @@ struct saa7134_board saa7134_boards[] = {
        [SAA7134_BOARD_FLYDVBTDUO] = {
                /* LifeView FlyDVB-T DUO */
                /* "Nico Sabbi <[EMAIL PROTECTED]>  Hartmut Hackmann [EMAIL 
PROTECTED]/
-               .name           = "LifeView FlyDVB-T DUO",
+               .name           = "LifeView FlyDVB-T DUO / MSI [EMAIL 
PROTECTED] Duo",
                .audio_clock    = 0x00200000,
                .tuner_type     = TUNER_PHILIPS_TDA8290,
                .radio_type     = UNSET,
@@ -4026,6 +4026,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .subdevice    = 0xf31e,
                .driver_data  = SAA7134_BOARD_AVERMEDIA_M102,
        },{
+               .vendor       = PCI_VENDOR_ID_PHILIPS,
+               .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+               .subvendor    = 0x4E42,         /* MSI */
+               .subdevice    = 0x0306,         /* [EMAIL PROTECTED] DUO */
+               .driver_data  = SAA7134_BOARD_FLYDVBTDUO,
+       },{
                /* --- boards without eeprom + subsystem ID --- */
                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to