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 48d94d4c38980ef9f1d60d03f8cb1066382a21c9..8f3467378e77134bbe615e4b56253ecad5a8954a 100644 (file)
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -7,7 +7,6 @@ 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.
@@ -38,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
@@ -45,5 +47,32 @@ config SND_OMAP_AIC23
 
          To compile this driver as a module, choose M here: the module
          will be called snd-omap-aic23.
+         
+config SND_OMAP_TSC2101
+       tristate "OMAP TSC2101 alsa driver"
+       depends on ARCH_OMAP && SND
+       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
+         been tested with H2 and iPAQ h6300.
+ 
+         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