diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-04-20 13:57:41 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-05-21 13:16:02 +0200 |
| commit | 05ff7240b0aa1794cebd8b0ecb846ed629fb5da3 (patch) | |
| tree | 6e17cf45e89e2d7f3115b187fe267f8ec1db6695 | |
| parent | [media] media: davinci: vpif_display: move displaying of error to appropprait... (diff) | |
| download | linux-05ff7240b0aa1794cebd8b0ecb846ed629fb5da3.tar.xz linux-05ff7240b0aa1794cebd8b0ecb846ed629fb5da3.zip | |
[media] CARDLIST.bttv: add new cards
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | Documentation/video4linux/CARDLIST.bttv | 2 | ||||
| -rw-r--r-- | drivers/media/pci/bt8xx/bttv.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv index 407ab4660dce..f14475011fea 100644 --- a/Documentation/video4linux/CARDLIST.bttv +++ b/Documentation/video4linux/CARDLIST.bttv @@ -161,3 +161,5 @@ 160 -> Tongwei Video Technology TD-3116 [f200:3116] 161 -> Aposonic W-DVR [0279:0228] 162 -> Adlink MPG24 +163 -> Bt848 Capture 14MHz +164 -> CyberVision CV06 (SV) diff --git a/drivers/media/pci/bt8xx/bttv.h b/drivers/media/pci/bt8xx/bttv.h index 9d09e303f1dd..df578efe03c9 100644 --- a/drivers/media/pci/bt8xx/bttv.h +++ b/drivers/media/pci/bt8xx/bttv.h @@ -187,6 +187,7 @@ #define BTTV_BOARD_APOSONIC_WDVR 0xa1 #define BTTV_BOARD_ADLINK_MPG24 0xa2 #define BTTV_BOARD_BT848_CAP_14 0xa3 +#define BTTV_BOARD_CYBERVISION_CV06 0xa4 /* more card-specific defines */ #define PT2254_L_CHANNEL 0x10 |