summaryrefslogtreecommitdiff
path: root/sound/soc/omap/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-05-06 17:06:27 +0200
committerTakashi Iwai <tiwai@suse.de>2010-05-06 17:06:27 +0200
commitaeb29a82de7c80d4d0253b042f17eb1f725b08f1 (patch)
treef15ba557a22b010cd790ead5a3c4a4a9872fe58f /sound/soc/omap/Kconfig
parent39b8eab7e7fe429d8d57f18c0ebdb7c25df55f5c (diff)
parent2f005471e2e2f2c7fa5898153387d421f7d24ad6 (diff)
Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc
Diffstat (limited to 'sound/soc/omap/Kconfig')
-rw-r--r--sound/soc/omap/Kconfig10
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index f11963c21873..83be4a76d2bb 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -18,6 +18,16 @@ config SND_OMAP_SOC_N810
help
Say Y if you want to add support for SoC audio on Nokia N810.
+config SND_OMAP_SOC_RX51
+ tristate "SoC Audio support for Nokia RX-51"
+ depends on SND_OMAP_SOC && MACH_NOKIA_RX51
+ select OMAP_MCBSP
+ select SND_OMAP_SOC_MCBSP
+ select SND_SOC_TLV320AIC3X
+ help
+ Say Y if you want to add support for SoC audio on Nokia RX-51
+ hardware. This is also known as Nokia N900 product.
+
config SND_OMAP_SOC_AMS_DELTA
tristate "SoC Audio support for Amstrad E3 (Delta) videophone"
depends on SND_OMAP_SOC && MACH_AMS_DELTA