summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-09-02 23:33:38 +0100
committerMark Brown <broonie@kernel.org>2014-09-02 23:33:38 +0100
commite65f6b1eb54036682786cb64d99c64d074ff4357 (patch)
tree70d5cc655365844e7b11aaf1ddae2138a2f183e9 /include
parent69e273c0b0a3c337a521d083374c918dc52c666f (diff)
parent4d61b39bc117b36682c1dd67ee386960ae826bef (diff)
downloadlinux-e65f6b1eb54036682786cb64d99c64d074ff4357.tar.bz2
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index be6ecae247b0..c83a334dd00f 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -277,7 +277,7 @@
.access = SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | \
SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, \
.tlv.c = (snd_soc_bytes_tlv_callback), \
- .info = snd_soc_info_bytes_ext, \
+ .info = snd_soc_bytes_info_ext, \
.private_value = (unsigned long)&(struct soc_bytes_ext) \
{.max = xcount, .get = xhandler_get, .put = xhandler_put, } }
#define SOC_SINGLE_XR_SX(xname, xregbase, xregcount, xnbits, \