summaryrefslogtreecommitdiffstats
path: root/sound/soc/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-08 14:11:45 +0100
committerMark Brown <broonie@kernel.org>2014-12-08 14:11:45 +0100
commit0a7e4ca1aad65458edebb718e1b915d1899056e7 (patch)
tree4c9a9c633823a08cfa7dc98fbbec423477f0d086 /sound/soc/Makefile
parentMerge remote-tracking branch 'asoc/topic/fsl-esai' into asoc-next (diff)
parentASoC: Disable regmap helpers if regmap is disabled (diff)
parentASoC: ad193x: Keep DAC output stage active in idle (diff)
parentASoC: adau1373: Replace w->codec with snd_soc_dapm_to_codec(w->dapm) (diff)
parentASoC: adau17x1: Replace w->codec with snd_soc_dapm_to_codec(w->dapm) (diff)
downloadlinux-0a7e4ca1aad65458edebb718e1b915d1899056e7.tar.xz
linux-0a7e4ca1aad65458edebb718e1b915d1899056e7.zip
Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ad193x', 'asoc/topic/adau1373' and 'asoc/topic/adau17x1' into asoc-next