Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[mv-sheeva.git] / sound / soc / omap / Kconfig

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 61952aa6cd5ac34a8a14e0324ccf2d036872eae8..f11963c218730ae2545df1af0c7b2eeba017216e 100644 (file)
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -6,6 +6,9 @@ config SND_OMAP_SOC_MCBSP
        tristate
        select OMAP_MCBSP
 
+config SND_OMAP_SOC_MCPDM
+       tristate
+
 config SND_OMAP_SOC_N810
        tristate "SoC Audio support for Nokia N810"
        depends on SND_OMAP_SOC && MACH_NOKIA_N810 && I2C
@@ -94,12 +97,14 @@ config SND_OMAP_SOC_OMAP3_PANDORA
          Say Y if you want to add support for SoC audio on the OMAP3 Pandora.
 
 config SND_OMAP_SOC_OMAP3_BEAGLE
-       tristate "SoC Audio support for OMAP3 Beagle"
-       depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3_BEAGLE
+       tristate "SoC Audio support for OMAP3 Beagle and Devkit8000"
+       depends on TWL4030_CORE && SND_OMAP_SOC
+       depends on (MACH_OMAP3_BEAGLE || MACH_DEVKIT8000)
        select SND_OMAP_SOC_MCBSP
        select SND_SOC_TWL4030
        help
-         Say Y if you want to add support for SoC audio on the Beagleboard.
+         Say Y if you want to add support for SoC audio on the Beagleboard or
+         the clone Devkit8000.
 
 config SND_OMAP_SOC_ZOOM2
        tristate "SoC Audio support for Zoom2"