Merge remote-tracking branch 'asoc/topic/ssm2518' into asoc-next

diff --cc sound/soc/codecs/Kconfig
Simple merge

diff --cc sound/soc/codecs/Makefile
index c8117cbd886443768738011cfce65c6c43a554b2,d85be48a6c073c0868c4f5d47a5fb470218fed88..70fd8066f546e9cfc39dcb024f1efa6e5ea6bf1f
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -51,8 -50,9 +51,9 @@@ snd-soc-alc5632-objs := alc5632.
  snd-soc-sigmadsp-objs := sigmadsp.o
  snd-soc-si476x-objs := si476x.o
  snd-soc-sn95031-objs := sn95031.o
 -snd-soc-spdif-tx-objs := spdif_transciever.o
 +snd-soc-spdif-tx-objs := spdif_transmitter.o
  snd-soc-spdif-rx-objs := spdif_receiver.o
+ snd-soc-ssm2518-objs := ssm2518.o
  snd-soc-ssm2602-objs := ssm2602.o
  snd-soc-sta32x-objs := sta32x.o
  snd-soc-sta529-objs := sta529.o