diff options
author | Mark Brown <broonie@linaro.org> | 2013-06-17 12:20:29 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-06-17 12:20:29 -0400 |
commit | bfe617d33db9871b1ac25b62e9086336cd633db2 (patch) | |
tree | 1f7e192567d929d0197bbc9792fd0fee588f7d3c /sound/soc/codecs/Makefile | |
parent | 5f5eb4efe575734e54f26c34ffffc4b48cdca3aa (diff) | |
parent | 1aad4e574bced05b4036e79981a7800dd275cf1c (diff) |
Merge remote-tracking branch 'asoc/topic/ssm2518' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Makefile')
-rw-r--r-- | sound/soc/codecs/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index c8117cbd8864..70fd8066f546 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile | |||
@@ -53,6 +53,7 @@ snd-soc-si476x-objs := si476x.o | |||
53 | snd-soc-sn95031-objs := sn95031.o | 53 | snd-soc-sn95031-objs := sn95031.o |
54 | snd-soc-spdif-tx-objs := spdif_transmitter.o | 54 | snd-soc-spdif-tx-objs := spdif_transmitter.o |
55 | snd-soc-spdif-rx-objs := spdif_receiver.o | 55 | snd-soc-spdif-rx-objs := spdif_receiver.o |
56 | snd-soc-ssm2518-objs := ssm2518.o | ||
56 | snd-soc-ssm2602-objs := ssm2602.o | 57 | snd-soc-ssm2602-objs := ssm2602.o |
57 | snd-soc-sta32x-objs := sta32x.o | 58 | snd-soc-sta32x-objs := sta32x.o |
58 | snd-soc-sta529-objs := sta529.o | 59 | snd-soc-sta529-objs := sta529.o |
@@ -178,6 +179,7 @@ obj-$(CONFIG_SND_SOC_SIGMADSP) += snd-soc-sigmadsp.o | |||
178 | obj-$(CONFIG_SND_SOC_SI476X) += snd-soc-si476x.o | 179 | obj-$(CONFIG_SND_SOC_SI476X) += snd-soc-si476x.o |
179 | obj-$(CONFIG_SND_SOC_SN95031) +=snd-soc-sn95031.o | 180 | obj-$(CONFIG_SND_SOC_SN95031) +=snd-soc-sn95031.o |
180 | obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif-rx.o snd-soc-spdif-tx.o | 181 | obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif-rx.o snd-soc-spdif-tx.o |
182 | obj-$(CONFIG_SND_SOC_SSM2518) += snd-soc-ssm2518.o | ||
181 | obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o | 183 | obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o |
182 | obj-$(CONFIG_SND_SOC_STA32X) += snd-soc-sta32x.o | 184 | obj-$(CONFIG_SND_SOC_STA32X) += snd-soc-sta32x.o |
183 | obj-$(CONFIG_SND_SOC_STA529) += snd-soc-sta529.o | 185 | obj-$(CONFIG_SND_SOC_STA529) += snd-soc-sta529.o |