Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

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

diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index ec821a57f8432c9742c285fb54d549b09f4f5df1..dccaa4be679edb2321b832ecf6645d7c4aa2503f 100644 (file)
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -10,6 +10,8 @@ config SND_SOC_AC97_BUS
 
 config SND_SOC
        tristate "SoC audio support"
+       depends on SND
+       select SND_PCM
        ---help---
 
          If you want SoC support, you should say Y here and also to the