diff options
author | Mike Isely <isely@pobox.com> | 2008-04-22 13:45:42 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:07:48 -0400 |
commit | fd1da7897999826d7491cdfd5b882ca8e9a965cb (patch) | |
tree | 91872a74d036374a69080a9bc566ce5f39707b3e /drivers/media/video/pvrusb2/pvrusb2-devattr.c | |
parent | 5fd782af71876562c098aab0b240ceef2779d888 (diff) |
V4L/DVB (7315): pvrusb2: Add Gotview USB 2.0 DVD Deluxe to supported devices
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-devattr.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-devattr.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c index 638c577e3268..1edb066142b4 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c +++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c | |||
@@ -123,6 +123,26 @@ static const struct pvr2_device_desc pvr2_device_gotview_2 = { | |||
123 | 123 | ||
124 | 124 | ||
125 | 125 | ||
126 | /*------------------------------------------------------------------------*/ | ||
127 | /* GOTVIEW USB2.0 DVD Deluxe */ | ||
128 | |||
129 | /* (same module list as gotview_2) */ | ||
130 | |||
131 | static const struct pvr2_device_desc pvr2_device_gotview_2d = { | ||
132 | .description = "Gotview USB 2.0 DVD Deluxe", | ||
133 | .shortname = "gv2d", | ||
134 | .client_modules.lst = pvr2_client_gotview_2, | ||
135 | .client_modules.cnt = ARRAY_SIZE(pvr2_client_gotview_2), | ||
136 | .flag_has_cx25840 = !0, | ||
137 | .default_tuner_type = TUNER_PHILIPS_FM1216ME_MK3, | ||
138 | .flag_has_analogtuner = !0, | ||
139 | .flag_has_composite = !0, | ||
140 | .flag_has_svideo = !0, | ||
141 | .signal_routing_scheme = PVR2_ROUTING_SCHEME_GOTVIEW, | ||
142 | }; | ||
143 | |||
144 | |||
145 | |||
126 | #ifdef CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR | 146 | #ifdef CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR |
127 | /*------------------------------------------------------------------------*/ | 147 | /*------------------------------------------------------------------------*/ |
128 | /* OnAir Creator */ | 148 | /* OnAir Creator */ |
@@ -251,6 +271,8 @@ struct usb_device_id pvr2_device_table[] = { | |||
251 | .driver_info = (kernel_ulong_t)&pvr2_device_24xxx}, | 271 | .driver_info = (kernel_ulong_t)&pvr2_device_24xxx}, |
252 | { USB_DEVICE(0x1164, 0x0622), | 272 | { USB_DEVICE(0x1164, 0x0622), |
253 | .driver_info = (kernel_ulong_t)&pvr2_device_gotview_2}, | 273 | .driver_info = (kernel_ulong_t)&pvr2_device_gotview_2}, |
274 | { USB_DEVICE(0x1164, 0x0602), | ||
275 | .driver_info = (kernel_ulong_t)&pvr2_device_gotview_2d}, | ||
254 | #ifdef CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR | 276 | #ifdef CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR |
255 | { USB_DEVICE(0x11ba, 0x1003), | 277 | { USB_DEVICE(0x11ba, 0x1003), |
256 | .driver_info = (kernel_ulong_t)&pvr2_device_onair_creator}, | 278 | .driver_info = (kernel_ulong_t)&pvr2_device_onair_creator}, |