From bab11c8489767e1688da055f0c8eef30d51fe4ec Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Mon, 17 Dec 2007 13:49:17 -0300 Subject: [PATCH] --- yaml --- r: 76609 b: refs/heads/master c: aec2aef267203d9ac06ce3508682c0aa81a069dc h: refs/heads/master i: 76607: 8566f3417d563c86478174c3732b06c4098e0132 v: v3 --- [refs] | 2 +- trunk/Documentation/video4linux/CARDLIST.em28xx | 2 +- trunk/drivers/media/video/em28xx/em28xx-cards.c | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e00b6274266f..910920aeb863 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e7e85ebaeba22979209268423f5aae8a352df4c +refs/heads/master: aec2aef267203d9ac06ce3508682c0aa81a069dc diff --git a/trunk/Documentation/video4linux/CARDLIST.em28xx b/trunk/Documentation/video4linux/CARDLIST.em28xx index ceb277543f51..dbc19ca9e483 100644 --- a/trunk/Documentation/video4linux/CARDLIST.em28xx +++ b/trunk/Documentation/video4linux/CARDLIST.em28xx @@ -7,7 +7,7 @@ 6 -> Terratec Cinergy 200 USB (em2800) 7 -> Leadtek Winfast USB II (em2800) 8 -> Kworld USB2800 (em2800) - 9 -> Pinnacle Dazzle DVC 90 (em2820/em2840) [2304:0207] + 9 -> Pinnacle Dazzle DVC 90/DVC 100 (em2820/em2840) [2304:0207,2304:021a] 10 -> Hauppauge WinTV HVR 900 (em2880) [2040:6500] 11 -> Terratec Hybrid XS (em2880) [0ccd:0042] 12 -> Kworld PVR TV 2800 RF (em2820/em2840) diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c index c4204c90fb01..e00de3286055 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c @@ -329,7 +329,7 @@ struct em28xx_board em28xx_boards[] = { } }, }, [EM2820_BOARD_PINNACLE_DVC_90] = { - .name = "Pinnacle Dazzle DVC 90", + .name = "Pinnacle Dazzle DVC 90/DVC 100", .vchannels = 3, .has_tuner = 0, .decoder = EM28XX_SAA7113, @@ -416,6 +416,8 @@ struct usb_device_id em28xx_id_table [] = { .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 }, { USB_DEVICE(0x2304, 0x0207), .driver_info = EM2820_BOARD_PINNACLE_DVC_90 }, + { USB_DEVICE(0x2304, 0x021a), + .driver_info = EM2820_BOARD_PINNACLE_DVC_90 }, { USB_DEVICE(0x2040, 0x6500), .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 }, { USB_DEVICE(0x2040, 0x6513),