Merge /spare/repo/linux-2.6/

[linux-2.6] / sound / arm / Kconfig

diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
index 34c1740aa6e9a7e1a1e0f32cbecca1cd9d2783ca..0864a7ce414d7bddb48a7497314e90a5d956d159 100644 (file)
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -7,6 +7,7 @@ config SND_SA11XX_UDA1341
        tristate "SA11xx UDA1341TS driver (iPaq H3600)"
        depends on ARCH_SA1100 && SND && L3
        select SND_PCM
+       select SND_GENERIC_DRIVER
        help
          Say Y here if you have a Compaq iPaq H3x00 handheld computer
          and want to use its Philips UDA 1341 audio chip.
@@ -20,5 +21,17 @@ config SND_ARMAACI
        select SND_PCM
        select SND_AC97_CODEC
 
-endmenu
+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