aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitris Papastamos <dp@opensource.wolfsonmicro.com>2010-11-29 05:54:28 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-29 07:43:52 -0500
commitdf0701bb8660107e811bddba6e4933385f697a21 (patch)
tree908b4c9a6abb198ce9a770461d58a7cd118afb5f
parent7a33d4ce8231f789548ce6e25f75894a6c8508a5 (diff)
ASoC: soc-cache: Ensure consistent cache naming
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--include/sound/soc.h2
-rw-r--r--sound/soc/soc-cache.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 3eb92ef6c83f..9e593cf1440b 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -256,7 +256,7 @@ enum snd_soc_control_type {
256}; 256};
257 257
258enum snd_soc_compress_type { 258enum snd_soc_compress_type {
259 SND_SOC_NO_COMPRESSION, 259 SND_SOC_FLAT_COMPRESSION,
260 SND_SOC_LZO_COMPRESSION, 260 SND_SOC_LZO_COMPRESSION,
261 SND_SOC_RBTREE_COMPRESSION 261 SND_SOC_RBTREE_COMPRESSION
262}; 262};
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index e5b18889a493..9b1ba33e6fe9 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -1520,7 +1520,7 @@ static int snd_soc_flat_cache_init(struct snd_soc_codec *codec)
1520/* an array of all supported compression types */ 1520/* an array of all supported compression types */
1521static const struct snd_soc_cache_ops cache_types[] = { 1521static const struct snd_soc_cache_ops cache_types[] = {
1522 { 1522 {
1523 .id = SND_SOC_NO_COMPRESSION, 1523 .id = SND_SOC_FLAT_COMPRESSION,
1524 .init = snd_soc_flat_cache_init, 1524 .init = snd_soc_flat_cache_init,
1525 .exit = snd_soc_flat_cache_exit, 1525 .exit = snd_soc_flat_cache_exit,
1526 .read = snd_soc_flat_cache_read, 1526 .read = snd_soc_flat_cache_read,