diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-08 14:19:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-08 14:19:23 -0700 |
| commit | ad552692a4489917fa4b71f9c6a91baae4aee799 (patch) | |
| tree | 26cd1c8a92f9c8f9a219961fe054adbf877e85f4 /sound/oss | |
| parent | 20dbfad8e5dfea56b3cb0cfd4465f01c37b57aa6 (diff) | |
| parent | 0851fb48486c044476b019029245cb9b348fca33 (diff) | |
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index f4980ca5c05..1b7c3dfc2b4 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig @@ -31,7 +31,7 @@ config SOUND_EMU10K1 For more information on this driver and the degree of support for the different card models please check: - <http://sourceforge.net/projects/emu10k1/> + <http://sourceforge.net/projects/emu10k1/> It is now possible to load dsp microcode patches into the EMU10K1 chip. These patches are used to implement real time sound @@ -140,7 +140,7 @@ config SOUND_TRIDENT system support" and "Sysctl support", and after the /proc file system has been mounted, executing the command - command what is enabled + command what is enabled echo 0>/proc/ALi5451 pcm out is also set to S/PDIF out. (Default). @@ -838,7 +838,7 @@ config SOUND_WAVEARTIST config SOUND_TVMIXER tristate "TV card (bt848) mixer support" - depends on SOUND_PRIME && I2C + depends on SOUND_PRIME && I2C && VIDEO_V4L1 help Support for audio mixer facilities on the BT848 TV frame-grabber card. |