diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-03-09 10:26:03 +0200 |
|---|---|---|
| committer | Liam Girdwood <lrg@ti.com> | 2012-03-12 13:34:25 +0000 |
| commit | d0f47ff17f29740eabbd64e11705b7332241714c (patch) | |
| tree | 3fdda5eb452dfa700047f29c8c14b0894d4b6928 /sound | |
| parent | 3ead4679e579560f4b5370e4a2f4c00ae4f1988b (diff) | |
| download | linux-3.10-d0f47ff17f29740eabbd64e11705b7332241714c.tar.gz linux-3.10-d0f47ff17f29740eabbd64e11705b7332241714c.tar.bz2 linux-3.10-d0f47ff17f29740eabbd64e11705b7332241714c.zip | |
ASoC: OMAP: Build config cleanup for McBSP
The McBSP driver stack has been moved, and rewritten resulting a single
driver - selected by CONFIG_SND_OMAP_SOC_MCBSP. There is no longer need to
have CONFIG_OMAP_MCBSP anymore.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonoie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/Kconfig | 6 | ||||
| -rw-r--r-- | sound/soc/omap/Makefile | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 27a3a29f7cd..e00dd0b1139 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -5,13 +5,8 @@ config SND_OMAP_SOC config SND_OMAP_SOC_DMIC tristate -config OMAP_MCBSP - tristate - depends on ARCH_OMAP - config SND_OMAP_SOC_MCBSP tristate - select OMAP_MCBSP config SND_OMAP_SOC_MCPDM tristate @@ -31,7 +26,6 @@ config SND_OMAP_SOC_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 select SND_SOC_TPA6130A2 diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index 9f8fbd554eb..1d656bce01d 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -1,13 +1,12 @@ # OMAP Platform Support snd-soc-omap-objs := omap-pcm.o snd-soc-omap-dmic-objs := omap-dmic.o -snd-soc-omap-mcbsp-objs := omap-mcbsp.o +snd-soc-omap-mcbsp-objs := omap-mcbsp.o mcbsp.o snd-soc-omap-mcpdm-objs := omap-mcpdm.o snd-soc-omap-hdmi-objs := omap-hdmi.o obj-$(CONFIG_SND_OMAP_SOC) += snd-soc-omap.o obj-$(CONFIG_SND_OMAP_SOC_DMIC) += snd-soc-omap-dmic.o -obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o obj-$(CONFIG_SND_OMAP_SOC_MCPDM) += snd-soc-omap-mcpdm.o obj-$(CONFIG_SND_OMAP_SOC_HDMI) += snd-soc-omap-hdmi.o |