diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-14 02:18:12 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-14 02:18:12 -0200 |
| commit | 50a5defff418272f0934301f540160d172b46c36 (patch) | |
| tree | 8cc091512468462aa4ec6dd8db0eff5d1fe7c480 /linux/drivers/media/video/cx18/cx18-cards.h | |
| parent | 427b70d46df23ba54523af265fd2bc28d061e435 (diff) | |
| parent | af2c8347ec518cf5ff646d2bf560206780775795 (diff) | |
| download | mediapointer-dvb-s2-50a5defff418272f0934301f540160d172b46c36.tar.gz mediapointer-dvb-s2-50a5defff418272f0934301f540160d172b46c36.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-ng
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-cards.h b/linux/drivers/media/video/cx18/cx18-cards.h index a54aae9ed..6fa7bcb42 100644 --- a/linux/drivers/media/video/cx18/cx18-cards.h +++ b/linux/drivers/media/video/cx18/cx18-cards.h @@ -48,8 +48,9 @@ /* 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_AUDIO | V4L2_CAP_READWRITE | \ + V4L2_CAP_VBI_CAPTURE) +/* | V4L2_CAP_SLICED_VBI_CAPTURE) not yet */ struct cx18_card_video_input { u8 video_type; /* video input type */ |