diff options
author | Stephen Warren <swarren@nvidia.com> | 2011-02-22 19:23:56 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-25 06:44:46 -0500 |
commit | a3cd50deef7ba7df506af5347764a00b4621d7a7 (patch) | |
tree | 91233c2918ed32cbfc1defcc218e15e6da7ec7f0 /sound/soc/tegra/Makefile | |
parent | 67f5ed6e716bf9b574c8cbe04765171de5d4d0fe (diff) |
ASoC: Tegra: Move utilities to separate module
The utilities will be required by every machine driver. Including the
utility object directly into every machine driver causes a build failure
if the modules are actually built into the kernel, since each will define
the symbols exported by the utility file. Solve this by moving the
utility object into a separate module.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/tegra/Makefile')
-rw-r--r-- | sound/soc/tegra/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile index dfd2ab9d975c..fd183d3ab4f1 100644 --- a/sound/soc/tegra/Makefile +++ b/sound/soc/tegra/Makefile | |||
@@ -2,13 +2,14 @@ | |||
2 | snd-soc-tegra-das-objs := tegra_das.o | 2 | snd-soc-tegra-das-objs := tegra_das.o |
3 | snd-soc-tegra-pcm-objs := tegra_pcm.o | 3 | snd-soc-tegra-pcm-objs := tegra_pcm.o |
4 | snd-soc-tegra-i2s-objs := tegra_i2s.o | 4 | snd-soc-tegra-i2s-objs := tegra_i2s.o |
5 | snd-soc-tegra-utils-objs += tegra_asoc_utils.o | ||
5 | 6 | ||
7 | obj-$(CONFIG_SND_TEGRA_SOC) += snd-soc-tegra-utils.o | ||
6 | obj-$(CONFIG_SND_TEGRA_SOC) += snd-soc-tegra-das.o | 8 | obj-$(CONFIG_SND_TEGRA_SOC) += snd-soc-tegra-das.o |
7 | obj-$(CONFIG_SND_TEGRA_SOC) += snd-soc-tegra-pcm.o | 9 | obj-$(CONFIG_SND_TEGRA_SOC) += snd-soc-tegra-pcm.o |
8 | obj-$(CONFIG_SND_TEGRA_SOC_I2S) += snd-soc-tegra-i2s.o | 10 | obj-$(CONFIG_SND_TEGRA_SOC_I2S) += snd-soc-tegra-i2s.o |
9 | 11 | ||
10 | # Tegra machine Support | 12 | # Tegra machine Support |
11 | snd-soc-tegra-harmony-objs := harmony.o | 13 | snd-soc-tegra-harmony-objs := harmony.o |
12 | snd-soc-tegra-harmony-objs += tegra_asoc_utils.o | ||
13 | 14 | ||
14 | obj-$(CONFIG_SND_TEGRA_SOC_HARMONY) += snd-soc-tegra-harmony.o | 15 | obj-$(CONFIG_SND_TEGRA_SOC_HARMONY) += snd-soc-tegra-harmony.o |