diff options
author | Mike Isely <isely@pobox.com> | 2009-03-15 16:53:29 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:40 -0400 |
commit | 2a6b627f8b4594987390ac35d3b344a96af3cfc9 (patch) | |
tree | 557e41183f3e99c073879dbb67ca29dbe7a839e8 /drivers/media/video/pvrusb2/pvrusb2-devattr.c | |
parent | bb65242aa374e7ebcd32672bc9a0b890bd9117bb (diff) |
V4L/DVB (11207): pvrusb2: Add composite and s-video input support for OnAir devices
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-devattr.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-devattr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c index 7483c1746079..1cb6a260e8b0 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c +++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c | |||
@@ -205,7 +205,7 @@ static const struct pvr2_device_desc pvr2_device_onair_creator = { | |||
205 | .flag_has_composite = !0, | 205 | .flag_has_composite = !0, |
206 | .flag_has_svideo = !0, | 206 | .flag_has_svideo = !0, |
207 | .flag_digital_requires_cx23416 = !0, | 207 | .flag_digital_requires_cx23416 = !0, |
208 | .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, | 208 | .signal_routing_scheme = PVR2_ROUTING_SCHEME_ONAIR, |
209 | .digital_control_scheme = PVR2_DIGITAL_SCHEME_ONAIR, | 209 | .digital_control_scheme = PVR2_DIGITAL_SCHEME_ONAIR, |
210 | .default_std_mask = V4L2_STD_NTSC_M, | 210 | .default_std_mask = V4L2_STD_NTSC_M, |
211 | #ifdef CONFIG_VIDEO_PVRUSB2_DVB | 211 | #ifdef CONFIG_VIDEO_PVRUSB2_DVB |
@@ -265,7 +265,7 @@ static const struct pvr2_device_desc pvr2_device_onair_usb2 = { | |||
265 | .flag_has_composite = !0, | 265 | .flag_has_composite = !0, |
266 | .flag_has_svideo = !0, | 266 | .flag_has_svideo = !0, |
267 | .flag_digital_requires_cx23416 = !0, | 267 | .flag_digital_requires_cx23416 = !0, |
268 | .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, | 268 | .signal_routing_scheme = PVR2_ROUTING_SCHEME_ONAIR, |
269 | .digital_control_scheme = PVR2_DIGITAL_SCHEME_ONAIR, | 269 | .digital_control_scheme = PVR2_DIGITAL_SCHEME_ONAIR, |
270 | .default_std_mask = V4L2_STD_NTSC_M, | 270 | .default_std_mask = V4L2_STD_NTSC_M, |
271 | #ifdef CONFIG_VIDEO_PVRUSB2_DVB | 271 | #ifdef CONFIG_VIDEO_PVRUSB2_DVB |