summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/cs42l51.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-13 00:04:52 +0100
committerMark Brown <broonie@linaro.org>2014-03-13 00:04:52 +0100
commitba67761c1a00636a9d1c97db45ce5c2f87299f18 (patch)
tree894cd2f3261dedd53bd26175cf29096940e4bfdb /sound/soc/codecs/cs42l51.c
parentMerge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', '... (diff)
parentASoC: tlv320aic23: Remove spurious bits per word setting (diff)
parentASoC: tlv320aic26: Use SOC_ENUM_SINGLE_DECL() (diff)
parentASoC: tlv320aic32x4: Sort Makefile in alphabetic order (diff)
parentASoC: tlv320aic3x: Remove tlv320aic32x4 from compatibles of tlv320aic3x (diff)
parentASoC: tlv320dac33: Use SOC_ENUM_SINGLE_*_DECL() (diff)
parentASoC: twl4030: Use SOC_ENUM_SINGLE_DECL() (diff)
parentASoC: twl6040: Use SOC_ENUM_SINGLE_DECL() (diff)
parentASoC: uda1380: Use SOC_ENUM_SINGLE_DECL() (diff)
parentASoC: wl1273: Use SOC_ENUM_SINGLE_EXT_DECL() (diff)
parentASoC: wm2200: Use SOC_ENUM_SINGLE_*_DECL() (diff)
downloadlinux-ba67761c1a00636a9d1c97db45ce5c2f87299f18.tar.xz
linux-ba67761c1a00636a9d1c97db45ce5c2f87299f18.zip
Merge remote-tracking branches 'asoc/topic/tlv320aic23', 'asoc/topic/tlv320aic26', 'asoc/topic/tlv320aic32x4', 'asoc/topic/tlv320aic3x', 'asoc/topic/tlv320dac33', 'asoc/topic/twl4030', 'asoc/topic/twl6040', 'asoc/topic/uda1380', 'asoc/topic/wl1273' and 'asoc/topic/wm2200' into asoc-next