diff options
author | Sri Deevi <Srinivasa.Deevi@conexant.com> | 2008-06-21 10:06:44 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:11:13 -0400 |
commit | 03c2808503b102971226007070c57410267d0b9d (patch) | |
tree | aeb3858db3f6cf61c574181b23804250ad68bfb5 /drivers/media/video/cx18/cx18-driver.c | |
parent | 464e9f3a0cabce9a7cf51f382f129d464483b0d0 (diff) |
V4L/DVB (8089): cx18: add support for Conexant Raptor PAL/SECAM card
Patch provided courtesy of Conexant http://www.conexant.com.
Signed-off-by: Srinivasa Deevi <srinivasa.deevi@conexant.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx18/cx18-driver.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-driver.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c index e9c7e07b9fed..71bb04ab91d7 100644 --- a/drivers/media/video/cx18/cx18-driver.c +++ b/drivers/media/video/cx18/cx18-driver.c | |||
@@ -120,6 +120,7 @@ MODULE_PARM_DESC(cardtype, | |||
120 | "\t\t\t 2 = Hauppauge HVR 1600 (Samsung memory)\n" | 120 | "\t\t\t 2 = Hauppauge HVR 1600 (Samsung memory)\n" |
121 | "\t\t\t 3 = Compro VideoMate H900\n" | 121 | "\t\t\t 3 = Compro VideoMate H900\n" |
122 | "\t\t\t 4 = Yuan MPC718\n" | 122 | "\t\t\t 4 = Yuan MPC718\n" |
123 | "\t\t\t 5 = Conexant Raptor PAL/SECAM\n" | ||
123 | "\t\t\t 0 = Autodetect (default)\n" | 124 | "\t\t\t 0 = Autodetect (default)\n" |
124 | "\t\t\t-1 = Ignore this card\n\t\t"); | 125 | "\t\t\t-1 = Ignore this card\n\t\t"); |
125 | MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60"); | 126 | MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60"); |
@@ -435,7 +436,7 @@ static int __devinit cx18_init_struct1(struct cx18 *cx) | |||
435 | (cx->params.video_temporal_filter_mode << 1) | | 436 | (cx->params.video_temporal_filter_mode << 1) | |
436 | (cx->params.video_median_filter_type << 2); | 437 | (cx->params.video_median_filter_type << 2); |
437 | cx->params.port = CX2341X_PORT_MEMORY; | 438 | cx->params.port = CX2341X_PORT_MEMORY; |
438 | cx->params.capabilities = CX2341X_CAP_HAS_SLICED_VBI; | 439 | cx->params.capabilities = 0; |
439 | init_waitqueue_head(&cx->cap_w); | 440 | init_waitqueue_head(&cx->cap_w); |
440 | init_waitqueue_head(&cx->mb_apu_waitq); | 441 | init_waitqueue_head(&cx->mb_apu_waitq); |
441 | init_waitqueue_head(&cx->mb_cpu_waitq); | 442 | init_waitqueue_head(&cx->mb_cpu_waitq); |