Merge branch 'linus' into x86/x2apic

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

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 257101f44e9e168de81dcbd2429b740b8c699954..3368ace60977eac389f1b57254e3fcb6c832ab4d 100644 (file)
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -1,8 +1,6 @@
-menu "ALSA SoC audio for Freescale SOCs"
-
 config SND_SOC_MPC8610
        bool "ALSA SoC support for the MPC8610 SOC"
-       depends on SND_SOC && MPC8610_HPCD
+       depends on MPC8610_HPCD
        default y if MPC8610
        help
          Say Y if you want to add support for codecs attached to the SSI
@@ -16,5 +14,3 @@ config SND_SOC_MPC8610_HPCD
        default y if MPC8610_HPCD
        help
          Say Y if you want to enable audio on the Freescale MPC8610 HPCD.
-
-endmenu