Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[pandora-kernel.git] / sound / oss / Kconfig

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 558c6ed..1b7c3df 100644 (file)
--- 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
@@ -98,8 +98,8 @@ config SOUND_HAL2
        tristate "SGI HAL2 sound (EXPERIMENTAL)"
        depends on SOUND_PRIME && SGI_IP22 && EXPERIMENTAL
        help
-         Say Y or M if you have an SGI Indy system and want to be able to
-         use it's on-board A2 audio system.
+         Say Y or M if you have an SGI Indy or Indigo2 system and want to be able to
+         use its on-board A2 audio system.
 
 config SOUND_IT8172
        tristate "IT8172G Sound"
@@ -114,8 +114,9 @@ config SOUND_VRC5477
          with the AC97 codec.
 
 config SOUND_AU1550_AC97
-       tristate "Au1550 AC97 Sound"
-       depends on SOUND_PRIME && SOC_AU1550
+       tristate "Au1550/Au1200 AC97 Sound"
+       select SND_AC97_CODEC
+       depends on SOUND_PRIME && (SOC_AU1550 || SOC_AU1200)
 
 config SOUND_TRIDENT
        tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core"
@@ -139,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).
 
@@ -492,6 +493,19 @@ config SOUND_CS4232
          See <file:Documentation/sound/oss/CS4232> for more information on
          configuring this card.
 
+config SOUND_SSCAPE
+       tristate "Ensoniq SoundScape support"
+       depends on SOUND_OSS
+       help
+         Answer Y if you have a sound card based on the Ensoniq SoundScape
+         chipset. Such cards are being manufactured at least by Ensoniq, Spea
+         and Reveal (Reveal makes also other cards).
+
+         If you compile the driver into the kernel, you have to add
+         "sscape=<io>,<irq>,<dma>,<mpuio>,<mpuirq>" to the kernel command
+         line.
+
+
 config SOUND_VMIDI
        tristate "Loopback MIDI device support"
        depends on SOUND_OSS
@@ -824,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.
@@ -838,6 +852,6 @@ config SOUND_SH_DAC_AUDIO
        depends on SOUND_PRIME && CPU_SH3
 
 config SOUND_SH_DAC_AUDIO_CHANNEL
-       int "    DAC channel"
+       int "DAC channel"
        default "1"
        depends on SOUND_SH_DAC_AUDIO