summaryrefslogtreecommitdiff
path: root/sound/arm/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-07-30 09:55:32 +0400
committerLen Brown <len.brown@intel.com>2005-07-30 09:55:32 +0400
commitadbedd34244e2b054557002817f979a9b004a405 (patch)
tree78e4a524e84f8b3e23ae8b49ac689048584e4668 /sound/arm/Kconfig
parentd6ac1a7910d22626bc77e73db091e00b810715f4 (diff)
parentb0825488a642cadcf39709961dde61440cb0731c (diff)
downloadlinux-adbedd34244e2b054557002817f979a9b004a405.tar.xz
merge 2.6.13-rc4 with ACPI's to-linus tree
Diffstat (limited to 'sound/arm/Kconfig')
-rw-r--r--sound/arm/Kconfig14
1 files changed, 13 insertions, 1 deletions
diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
index 34c1740aa6e9..2e4a5e0d16db 100644
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -20,5 +20,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