Merge with /home/tmlind/src/kernel/linux-2.6

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

diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
index cccdf23e8e6e4a107fcbe8789a48364b95a9c500..8f3467378e77134bbe615e4b56253ecad5a8954a 100644 (file)
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -37,6 +37,9 @@ 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 OMAP_MCBSP
        select SENSORS_TLV320AIC23
        help
          Say Y here if you have a OSK platform board
@@ -51,6 +54,7 @@ config SND_OMAP_TSC2101
        select SND_PCM
          select OMAP_TSC2101
          select OMAP_UWIRE if ARCH_OMAP
+        select OMAP_MCBSP
        help
          Say Y here if you have a OMAP platform board
          and want to use its TSC2101 audio chip. Driver has
@@ -59,4 +63,16 @@ config SND_OMAP_TSC2101
          To compile this driver as a module, choose M here: the module
          will be called snd-omap-tsc2101.
 
+config SND_OMAP_TSC2102
+       tristate "OMAP TSC2102 alsa driver"
+       depends on ARCH_OMAP && SND
+       select SND_PCM
+       select TSC2102
+       help
+         Say Y here if you have an OMAP platform board
+         and want to use its TSC2102 audio chip.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-omap-tsc2102.
+
 endmenu