Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / sound / oss / Kconfig

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 080ab036b67a791c49b8ed3073dc63489cea8637..3b8cdbca263665e53eca3f06b96c353912f6a218 100644 (file)
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -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"
@@ -838,6 +839,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