summaryrefslogtreecommitdiffstats
path: root/sound/soc/sh/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-11 12:17:14 +0200
committerMark Brown <broonie@linaro.org>2013-09-11 12:17:14 +0200
commit29dc5dd229dc3130b51df0932e59946fc09d3bd4 (patch)
tree51fbe8eb543fc4fd3f8ee6582bdc72ea0bccee6f /sound/soc/sh/Makefile
parentLinux 3.11 (diff)
parentASoC: atmel: disable error interrupt (diff)
downloadlinux-29dc5dd229dc3130b51df0932e59946fc09d3bd4.tar.xz
linux-29dc5dd229dc3130b51df0932e59946fc09d3bd4.zip
Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus
Diffstat (limited to 'sound/soc/sh/Makefile')
-rw-r--r--sound/soc/sh/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/sh/Makefile b/sound/soc/sh/Makefile
index 849b387d17d9..aaf3dcd1ee2a 100644
--- a/sound/soc/sh/Makefile
+++ b/sound/soc/sh/Makefile
@@ -12,6 +12,9 @@ obj-$(CONFIG_SND_SOC_SH4_SSI) += snd-soc-ssi.o
obj-$(CONFIG_SND_SOC_SH4_FSI) += snd-soc-fsi.o
obj-$(CONFIG_SND_SOC_SH4_SIU) += snd-soc-siu.o
+## audio units for R-Car
+obj-$(CONFIG_SND_SOC_RCAR) += rcar/
+
## boards
snd-soc-sh7760-ac97-objs := sh7760-ac97.o
snd-soc-migor-objs := migor.o