Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / sound / arm / Kconfig

diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
index 1da2786..2e4a5e0 100644 (file)
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -4,12 +4,33 @@ menu "ALSA ARM devices"
        depends on SND!=n && ARM
 
 config SND_SA11XX_UDA1341
-       tristate "SA11xx UDA1341TS driver (H3600)"
+       tristate "SA11xx UDA1341TS driver (iPaq H3600)"
        depends on ARCH_SA1100 && SND && L3
        select SND_PCM
        help
-         Say Y or M if you have a Compaq iPaq H3x00 handheld computer and want
-         to use its Philips UDA 1341 audio chip.
+         Say Y here if you have a Compaq iPaq H3x00 handheld computer
+         and want to use its Philips UDA 1341 audio chip.
 
-endmenu
+         To compile this driver as a module, choose M here: the module
+         will be called snd-sa11xx-uda1341.
+
+config SND_ARMAACI
+       tristate "ARM PrimeCell PL041 AC Link support"
+       depends on SND && ARM_AMBA
+       select SND_PCM
+       select SND_AC97_CODEC
+
+config SND_PXA2XX_PCM
+       tristate
+       select SND_PCM
+
+config SND_PXA2XX_AC97
+       tristate "AC97 driver for the Intel PXA2xx chip"
+       depends on ARCH_PXA && SND
+       select SND_PXA2XX_PCM
+       select SND_AC97_CODEC
+       help
+         Say Y or M if you want to support any AC97 codec attached to
+         the PXA2xx AC97 interface.
 
+endmenu