Merge current mainline tree into linux-omap tree

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

diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
index 06a24df059f8d1e166bb92a81d165c7ae6a002a3..3e4b26349f4d939280b6533e00122e955c60ef93 100644 (file)
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -32,11 +32,20 @@ config SND_PXA2XX_PCM
        tristate
        select SND_PCM
 
+config SND_PXA2XX_LIB
+       tristate
+       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"
        depends on ARCH_PXA
        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.
@@ -45,8 +54,8 @@ config SND_OMAP_AIC23
        tristate "OMAP AIC23 alsa driver (osk5912)"
        depends on ARCH_OMAP && SND
        select SND_PCM
-       select I2C
-       select I2C_OMAP if ARCH_OMAP
+       #select I2C
+       #select I2C_OMAP if ARCH_OMAP
        select SENSORS_TLV320AIC23
        help
          Say Y here if you have a OSK platform board