summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/Makefile
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-03-09 09:23:27 +0100
committerLiam Girdwood <lrg@ti.com>2012-03-12 14:34:24 +0100
commit3ead4679e579560f4b5370e4a2f4c00ae4f1988b (patch)
treef09ca526c59909047ca3e11741bfc9eefbee639a /arch/arm/mach-omap1/Makefile
parentASoC: omap-mcbsp: fix snd_pcm_hw_rule_add arguments (diff)
downloadlinux-3ead4679e579560f4b5370e4a2f4c00ae4f1988b.tar.xz
linux-3ead4679e579560f4b5370e4a2f4c00ae4f1988b.zip
ARM: OMAP: Remove CONFIG_OMAP_MCBSP references
The McBSP driver stack has been moved to ASoC. The CONFIG_OMAP_MCBSP will be removed since the CONFIG_SND_OMAP_SOC_MCBSP will trigger to build the McBSP (audio) drivers. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'arch/arm/mach-omap1/Makefile')
-rw-r--r--arch/arm/mach-omap1/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
index 11c85cd2731a..9923f92b5450 100644
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
@@ -6,7 +6,9 @@
obj-y := io.o id.o sram.o time.o irq.o mux.o flash.o serial.o devices.o dma.o
obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o
-obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
+ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)
+obj-y += mcbsp.o
+endif
obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o