Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

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

diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
index 2e554815e27c9a61f565839ece16362b5e700698..f8e6de48d816a49d4451b88b8417069ae1062510 100644 (file)
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -34,7 +34,10 @@ config SND_PXA2XX_PCM
 
 config SND_PXA2XX_LIB
        tristate
-       select SND_AC97_CODEC
+       select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97
+
+config SND_PXA2XX_LIB_AC97
+       bool
 
 config SND_PXA2XX_AC97
        tristate "AC97 driver for the Intel PXA2xx chip"
@@ -42,6 +45,7 @@ config SND_PXA2XX_AC97
        select SND_PXA2XX_PCM
        select SND_AC97_CODEC
        select SND_PXA2XX_LIB
+       select SND_PXA2XX_LIB_AC97
        help
          Say Y or M if you want to support any AC97 codec attached to
          the PXA2xx AC97 interface.