summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2009-12-10 11:15:55 -0600
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-12-10 19:36:38 +0000
commit761c9d45d14e0afa3c0b8eb84b4075602e50533b (patch)
treeb42d7ef74b1347215b5f141a53e541851242b73f /sound
parent370066e2b13bafa8e742673f658e617b6ed143a4 (diff)
downloadlinux-3.10-761c9d45d14e0afa3c0b8eb84b4075602e50533b.tar.gz
linux-3.10-761c9d45d14e0afa3c0b8eb84b4075602e50533b.tar.bz2
linux-3.10-761c9d45d14e0afa3c0b8eb84b4075602e50533b.zip
ASoC: Fix build of OMAP sound drivers
There are build errors when building for some of the omap2/3 boards without enabling sound: sound/built-in.o:(.data+0x43bc): undefined reference to `soc_codec_dev_tlv320aic23' sound/built-in.o:(.data+0x43cc): undefined reference to `tlv320aic23_dai' Confused me quite a bit since the drivers that had references to the codec weren't enabled. Turns out the Makefile was using the wrong config option to enable them. Patch below. Reported-by: Anand Gadiyar <gadiyar@ti.com> Signed-off-by: Olof Johansson <olof@lixom.net> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/omap/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile
index d49458a29bb..3db8a6c523f 100644
--- a/sound/soc/omap/Makefile
+++ b/sound/soc/omap/Makefile
@@ -23,9 +23,9 @@ obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o
obj-$(CONFIG_SND_OMAP_SOC_AMS_DELTA) += snd-soc-ams-delta.o
obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o
obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o
-obj-$(CONFIG_MACH_OMAP2EVM) += snd-soc-omap2evm.o
-obj-$(CONFIG_MACH_OMAP3EVM) += snd-soc-omap3evm.o
-obj-$(CONFIG_MACH_OMAP3517EVM) += snd-soc-am3517evm.o
+obj-$(CONFIG_SND_OMAP_SOC_OMAP2EVM) += snd-soc-omap2evm.o
+obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o
+obj-$(CONFIG_SND_OMAP_SOC_OMAP3517EVM) += snd-soc-am3517evm.o
obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o
obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o
obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o