diff options
| author | Mark Brown <broonie@kernel.org> | 2018-08-09 14:47:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-09 14:47:05 +0100 |
| commit | 4aa5db22d35588e1a5d2ee88472348ea73d9fb23 (patch) | |
| tree | 67c98488983a71305e24940930d6e27a96d54db2 /sound/soc/Makefile | |
| parent | 6c084839877666d987ff8bc4e0facd3c02d99d61 (diff) | |
| parent | f2cf0ef7c0ce141bb38f315c34c56e6ef5667a27 (diff) | |
Merge branch 'asoc-4.19' into asoc-next
Diffstat (limited to 'sound/soc/Makefile')
| -rw-r--r-- | sound/soc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/Makefile b/sound/soc/Makefile index 06389a5385d7..62a5f87c3cfc 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -38,6 +38,7 @@ obj-$(CONFIG_SND_SOC) += jz4740/ obj-$(CONFIG_SND_SOC) += img/ obj-$(CONFIG_SND_SOC) += intel/ obj-$(CONFIG_SND_SOC) += mediatek/ +obj-$(CONFIG_SND_SOC) += meson/ obj-$(CONFIG_SND_SOC) += mxs/ obj-$(CONFIG_SND_SOC) += nuc900/ obj-$(CONFIG_SND_SOC) += omap/ |