diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 02:20:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 02:20:01 -0500 |
| commit | d669af9d5afb5bdb629f78d024b35e507465f570 (patch) | |
| tree | 711ab23d69098fa05973b69efbd0ae61cc7ff927 /drivers/media/video/cx88/Kconfig | |
| parent | 2ddb55f091a9c74a297d72b50f8310c0c8ed7d1d (diff) | |
| parent | f87d09be8c2c270b83c2ad80d06206a7306e2fa9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/video/cx88/Kconfig')
| -rw-r--r-- | drivers/media/video/cx88/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig index 76fcb4e995c9..53308911ae6e 100644 --- a/drivers/media/video/cx88/Kconfig +++ b/drivers/media/video/cx88/Kconfig | |||
| @@ -31,8 +31,7 @@ config VIDEO_CX88_DVB | |||
| 31 | 31 | ||
| 32 | config VIDEO_CX88_ALSA | 32 | config VIDEO_CX88_ALSA |
| 33 | tristate "ALSA DMA audio support" | 33 | tristate "ALSA DMA audio support" |
| 34 | depends on VIDEO_CX88 && SND | 34 | depends on VIDEO_CX88 && SND && EXPERIMENTAL |
| 35 | select SND_PCM_OSS | ||
| 36 | ---help--- | 35 | ---help--- |
| 37 | This is a video4linux driver for direct (DMA) audio on | 36 | This is a video4linux driver for direct (DMA) audio on |
| 38 | Conexant 2388x based TV cards. | 37 | Conexant 2388x based TV cards. |