diff options
author | Ben Zhang <benzh@chromium.org> | 2014-10-20 23:30:13 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-10-23 06:06:06 -0400 |
commit | e29bee098ea1cc9b8537628f3c1cdf60ead83514 (patch) | |
tree | 6c023092cf08552db50681167c471fb9d542d8e1 /sound/soc/codecs/Makefile | |
parent | 2d27deb40db74c751c991e96ca91d675f966a0c5 (diff) |
ASoC: rt5677: fix rt5677 spi driver build
Create a separate module for rt5677 spi driver. Without
this patch, the build fails due to multiple defs of
'init_module' and 'cleanup_module'. module_spi_driver()
defines its own module, so it can't be part of the rt5677
module.
Signed-off-by: Ben Zhang <benzh@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/Makefile')
-rw-r--r-- | sound/soc/codecs/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 4435f9f18ce8..3e57edc1f510 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile | |||
@@ -79,7 +79,8 @@ snd-soc-rt5640-objs := rt5640.o | |||
79 | snd-soc-rt5645-objs := rt5645.o | 79 | snd-soc-rt5645-objs := rt5645.o |
80 | snd-soc-rt5651-objs := rt5651.o | 80 | snd-soc-rt5651-objs := rt5651.o |
81 | snd-soc-rt5670-objs := rt5670.o | 81 | snd-soc-rt5670-objs := rt5670.o |
82 | snd-soc-rt5677-objs := rt5677.o rt5677-spi.o | 82 | snd-soc-rt5677-objs := rt5677.o |
83 | snd-soc-rt5677-spi-objs := rt5677-spi.o | ||
83 | snd-soc-sgtl5000-objs := sgtl5000.o | 84 | snd-soc-sgtl5000-objs := sgtl5000.o |
84 | snd-soc-alc5623-objs := alc5623.o | 85 | snd-soc-alc5623-objs := alc5623.o |
85 | snd-soc-alc5632-objs := alc5632.o | 86 | snd-soc-alc5632-objs := alc5632.o |
@@ -256,6 +257,7 @@ obj-$(CONFIG_SND_SOC_RT5645) += snd-soc-rt5645.o | |||
256 | obj-$(CONFIG_SND_SOC_RT5651) += snd-soc-rt5651.o | 257 | obj-$(CONFIG_SND_SOC_RT5651) += snd-soc-rt5651.o |
257 | obj-$(CONFIG_SND_SOC_RT5670) += snd-soc-rt5670.o | 258 | obj-$(CONFIG_SND_SOC_RT5670) += snd-soc-rt5670.o |
258 | obj-$(CONFIG_SND_SOC_RT5677) += snd-soc-rt5677.o | 259 | obj-$(CONFIG_SND_SOC_RT5677) += snd-soc-rt5677.o |
260 | obj-$(CONFIG_SND_SOC_RT5677_SPI) += snd-soc-rt5677-spi.o | ||
259 | obj-$(CONFIG_SND_SOC_SGTL5000) += snd-soc-sgtl5000.o | 261 | obj-$(CONFIG_SND_SOC_SGTL5000) += snd-soc-sgtl5000.o |
260 | obj-$(CONFIG_SND_SOC_SIGMADSP) += snd-soc-sigmadsp.o | 262 | obj-$(CONFIG_SND_SOC_SIGMADSP) += snd-soc-sigmadsp.o |
261 | obj-$(CONFIG_SND_SOC_SIGMADSP_I2C) += snd-soc-sigmadsp-i2c.o | 263 | obj-$(CONFIG_SND_SOC_SIGMADSP_I2C) += snd-soc-sigmadsp-i2c.o |