diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-02 01:48:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-02 01:48:08 -0300 |
| commit | 5cf2fa0e402fe499df0fe2fe0e8120d8e41e86a1 (patch) | |
| tree | 0b4feb09cbf478ea51e7bc9f89e530ee3c190de0 | |
| parent | d2f6bc6b2ac8f3da0943ea2761aa8d30bf4a00f5 (diff) | |
| parent | 98780ee364fd5788ea4447d893ea8b193c34bfcc (diff) | |
| download | mediapointer-dvb-s2-5cf2fa0e402fe499df0fe2fe0e8120d8e41e86a1.tar.gz mediapointer-dvb-s2-5cf2fa0e402fe499df0fe2fe0e8120d8e41e86a1.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/em288x-hvr950
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.em28xx | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-cards.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.em28xx b/linux/Documentation/video4linux/CARDLIST.em28xx index f40e09296..1d6a245c8 100644 --- a/linux/Documentation/video4linux/CARDLIST.em28xx +++ b/linux/Documentation/video4linux/CARDLIST.em28xx @@ -14,4 +14,4 @@ 13 -> Terratec Prodigy XS (em2880) [0ccd:0047] 14 -> Pixelview Prolink PlayTV USB 2.0 (em2820/em2840) 15 -> V-Gear PocketTV (em2800) - 16 -> Hauppauge WinTV HVR 950 (em2880) [2040:6513] + 16 -> Hauppauge WinTV HVR 950 (em2880) [2040:6513,2040:6517,2040:651b,2040:651f] diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c index bdf64cd9c..a9b6a5ecd 100644 --- a/linux/drivers/media/video/em28xx/em28xx-cards.c +++ b/linux/drivers/media/video/em28xx/em28xx-cards.c @@ -421,7 +421,13 @@ struct usb_device_id em28xx_id_table [] = { .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 }, { USB_DEVICE(0x2040, 0x6502), .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 }, - { USB_DEVICE(0x2040, 0x6513), + { USB_DEVICE(0x2040, 0x6513), /* HCW HVR-980 */ + .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 }, + { USB_DEVICE(0x2040, 0x6517), /* HP HVR-950 */ + .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 }, + { USB_DEVICE(0x2040, 0x651b), /* RP HVR-950 */ + .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 }, + { USB_DEVICE(0x2040, 0x651f), /* HCW HVR-850 */ .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 }, { USB_DEVICE(0x0ccd, 0x0042), .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS }, |