aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhenyu Wang <zhen78@gmail.com>2009-07-05 09:51:21 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-12 11:17:21 -0400
commit7c8b56795fdf59761ee3475b6add2fd4b635d2b6 (patch)
tree045e24415dff1fda0096d7c4fea07738474eaf89
parent5bdf1377587bbde8ef0893cf726de116c2250208 (diff)
V4L/DVB (12190): em28xx: Add support for Gadmei UTV330+
em28xx: Add support for Gadmei UTV330+ Signed-off-by: Zhenyu Wang <zhen78@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/video4linux/CARDLIST.em28xx2
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index e352d754875c..66e5f829577c 100644
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -33,7 +33,7 @@
33 34 -> Terratec Cinergy A Hybrid XS (em2860) [0ccd:004f] 33 34 -> Terratec Cinergy A Hybrid XS (em2860) [0ccd:004f]
34 35 -> Typhoon DVD Maker (em2860) 34 35 -> Typhoon DVD Maker (em2860)
35 36 -> NetGMBH Cam (em2860) 35 36 -> NetGMBH Cam (em2860)
36 37 -> Gadmei UTV330 (em2860) 36 37 -> Gadmei UTV330 (em2860) [eb1a:50a6]
37 38 -> Yakumo MovieMixer (em2861) 37 38 -> Yakumo MovieMixer (em2861)
38 39 -> KWorld PVRTV 300U (em2861) [eb1a:e300] 38 39 -> KWorld PVRTV 300U (em2861) [eb1a:e300]
39 40 -> Plextor ConvertX PX-TV100U (em2861) [093b:a005] 39 40 -> Plextor ConvertX PX-TV100U (em2861) [093b:a005]
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 1c2e544eda73..22a464f5007b 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1649,6 +1649,8 @@ struct usb_device_id em28xx_id_table[] = {
1649 .driver_info = EM2861_BOARD_PLEXTOR_PX_TV100U }, 1649 .driver_info = EM2861_BOARD_PLEXTOR_PX_TV100U },
1650 { USB_DEVICE(0x04bb, 0x0515), 1650 { USB_DEVICE(0x04bb, 0x0515),
1651 .driver_info = EM2820_BOARD_IODATA_GVMVP_SZ }, 1651 .driver_info = EM2820_BOARD_IODATA_GVMVP_SZ },
1652 { USB_DEVICE(0xeb1a, 0x50a6),
1653 .driver_info = EM2860_BOARD_GADMEI_UTV330 },
1652 { }, 1654 { },
1653}; 1655};
1654MODULE_DEVICE_TABLE(usb, em28xx_id_table); 1656MODULE_DEVICE_TABLE(usb, em28xx_id_table);