aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-12 23:04:22 +0000
committerMark Brown <broonie@linaro.org>2014-03-12 23:04:22 +0000
commit84f6965e2b49be82bda0cc794c9a01b8b500cb37 (patch)
tree626c6f44b914ed1bab0692471bd4f2e96ad84cd5 /sound/soc/intel/Makefile
parentMerge remote-tracking branches 'asoc/topic/arizona', 'asoc/topic/atmel', 'asoc/topic/cirrus', 'asoc/topic/cs4271', 'asoc/topic/cs42l51', 'asoc/topic/cs42l52', 'asoc/topic/cs42l73' and 'asoc/topic/da7210' into asoc-next (diff)
parentASoC: da7213: Use SOC_ENUM_SINGLE_DECL() (diff)
parentASoC: da732x: Use da732x->regmap instead of codec->control_data (diff)
parentASoC: da9055: Use SOC_ENUM_SINGLE_DECL() (diff)
parentASoC: davinci-mcasp: Rename the pointer to davinci dma_params as dma_params (diff)
parentMerge branch 'topic/tlv320aic23' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-fsl (diff)
parentASoC: fsl-esai: big-endian support (diff)
parentASoC: fsl-sai: Add SND_SOC_DAIFMT_DSP_A/B support. (diff)
parentASoC: fsl-spdif: big-endian support (diff)
downloadlinux-dev-84f6965e2b49be82bda0cc794c9a01b8b500cb37.tar.xz
linux-dev-84f6965e2b49be82bda0cc794c9a01b8b500cb37.zip
Merge remote-tracking branches 'asoc/topic/da7213', 'asoc/topic/da732x', 'asoc/topic/da9055', 'asoc/topic/davinci', 'asoc/topic/fsl', 'asoc/topic/fsl-esai', 'asoc/topic/fsl-sai' and 'asoc/topic/fsl-spdif' into asoc-next