diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-09 19:08:43 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-09 19:08:43 -0200 |
commit | 803b1cde37f44f2d09bb97bef92d74ead3279578 (patch) | |
tree | 19bca69318c3ca400d01349582322fcf1d5da1e4 /linux/drivers/media/video/cx18/cx18-cards.h | |
parent | 41579b5b51a952f7bfaf05f5147f83148a7a3a68 (diff) | |
parent | 97ff0b0275491dc62dbee36a7e53c4c3455efa8e (diff) | |
download | mediapointer-dvb-s2-803b1cde37f44f2d09bb97bef92d74ead3279578.tar.gz mediapointer-dvb-s2-803b1cde37f44f2d09bb97bef92d74ead3279578.tar.bz2 |
merge: http://linuxtv.org/hg/~dougsland/radios
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-cards.h')
-rw-r--r-- | linux/drivers/media/video/cx18/cx18-cards.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-cards.h b/linux/drivers/media/video/cx18/cx18-cards.h index 6fa7bcb42..f8ee29f10 100644 --- a/linux/drivers/media/video/cx18/cx18-cards.h +++ b/linux/drivers/media/video/cx18/cx18-cards.h @@ -49,8 +49,7 @@ /* V4L2 capability aliases */ #define CX18_CAP_ENCODER (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER | \ V4L2_CAP_AUDIO | V4L2_CAP_READWRITE | \ - V4L2_CAP_VBI_CAPTURE) -/* | V4L2_CAP_SLICED_VBI_CAPTURE) not yet */ + V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE) struct cx18_card_video_input { u8 video_type; /* video input type */ |