summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-10 15:02:37 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-10 15:02:37 +0000
commitfad837c16cdd856c68ce2e1335ad0fe836ed8ecd (patch)
tree1a6babdc2ac7e5388c482e93505fdfaf5ff97f61 /sound/soc/omap/Kconfig
parent51c6ab130642ed975681df843c772dda48a1d2ed (diff)
parent57d54889cd00db2752994b389ba714138652e60c (diff)
downloadblackbird-op-linux-fad837c16cdd856c68ce2e1335ad0fe836ed8ecd.tar.gz
blackbird-op-linux-fad837c16cdd856c68ce2e1335ad0fe836ed8ecd.zip
Merge commit 'v2.6.34-rc1' into for-2.6.35
Diffstat (limited to 'sound/soc/omap/Kconfig')
-rw-r--r--sound/soc/omap/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 18ebdc7d0a51..f11963c21873 100644
--- 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
OpenPOWER on IntegriCloud