Merge with ../linux-2.6

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

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 953e5f3ea03d6bb990584f58bed059b6f8420c25..0eb23d3b73f38f113945a45ec2f2642bc276da8a 100644 (file)
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -4,6 +4,31 @@
 # More hacking for modularisation.
 #
 # Prompt user for primary drivers.
+config SOUND_OMAP
+       tristate "OMAP Sound Driver"
+       depends on SOUND_PRIME!=n && SOUND && ARCH_OMAP
+       ---help---
+         OMAP Audio driver
+
+config SOUND_OMAP_TSC2101
+       tristate "TSC2101 Stereo Codec"
+       depends on SOUND_OMAP && ( MACH_OMAP_H2 || MACH_OMAP_H3 )
+       select OMAP_TSC2101
+       select OMAP_UWIRE if ARCH_OMAP
+       ---help---
+         Tsc2101 Audio Codec Driver for OMAP will be enabled.
+         Will also Enable the following:
+         1. uWire Driver based on Platform
+         2. TSC2101 Glue driver
+
+config SOUND_OMAP_AIC23
+       tristate "AIC23 Stereo Codec"
+       depends on SOUND_OMAP && ( MACH_OMAP_INNOVATOR || MACH_OMAP_OSK )
+       select SENSORS_TLV320AIC23 if ARCH_OMAP
+       ---help---
+         AIC23 Audio Codec Driver for OMAP will be enabled.
+         Additionally, AIC23 I2C support is enabled.
+
 config SOUND_BT878
        tristate "BT878 audio dma"
        depends on SOUND_PRIME && PCI