Merge current mainline tree into linux-omap tree

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

diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 52e613e282ca3404dd3421480ec8d88f11417461..18f28ac4bfe82997733df97c1c1eaaf05dc41adb 100644 (file)
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -29,6 +29,7 @@ source "sound/soc/pxa/Kconfig"
 source "sound/soc/s3c24xx/Kconfig"
 source "sound/soc/sh/Kconfig"
 source "sound/soc/fsl/Kconfig"
+source "sound/soc/davinci/Kconfig"
 source "sound/soc/omap/Kconfig"
 
 # Supported codecs