diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
| commit | 3bb5da3837cc1aa17736b05139c9a22c3794851a (patch) | |
| tree | c92d5684a866542b1cb20641607ac1643ce03a47 /drivers/media/video/Kconfig | |
| parent | 7feb49c82a74bc7c091b8ab2a3f96baa33d08ece (diff) | |
| parent | 9597362d354f8655ece324b01d0c640a0e99c077 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/media/video/Kconfig')
| -rw-r--r-- | drivers/media/video/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 37072a21d8c9..1832966f53f3 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
| @@ -305,7 +305,7 @@ comment "MPEG video encoders" | |||
| 305 | 305 | ||
| 306 | config VIDEO_CX2341X | 306 | config VIDEO_CX2341X |
| 307 | tristate "Conexant CX2341x MPEG encoders" | 307 | tristate "Conexant CX2341x MPEG encoders" |
| 308 | depends on VIDEO_V4L2 && EXPERIMENTAL | 308 | depends on VIDEO_V4L2 && EXPERIMENTAL && VIDEO_V4L2_COMMON |
| 309 | ---help--- | 309 | ---help--- |
| 310 | Support for the Conexant CX23416 MPEG encoders | 310 | Support for the Conexant CX23416 MPEG encoders |
| 311 | and CX23415 MPEG encoder/decoders. | 311 | and CX23415 MPEG encoder/decoders. |
| @@ -382,7 +382,7 @@ endmenu # encoder / decoder chips | |||
| 382 | 382 | ||
| 383 | config VIDEO_VIVI | 383 | config VIDEO_VIVI |
| 384 | tristate "Virtual Video Driver" | 384 | tristate "Virtual Video Driver" |
| 385 | depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 | 385 | depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 |
| 386 | select VIDEOBUF_VMALLOC | 386 | select VIDEOBUF_VMALLOC |
| 387 | default n | 387 | default n |
| 388 | ---help--- | 388 | ---help--- |