summaryrefslogtreecommitdiffstats
path: root/include/sound/soc-dapm.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-09 11:03:55 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-09 11:03:55 +0000
commit5852973c129cf7c7e6c229abb7250673fc2a50c9 (patch)
treece61401fc06a086309d496ae2e015d7d3b504ab8 /include/sound/soc-dapm.h
parent3e8e1952e3a3dd59b11233a532ca68e6471742d9 (diff)
parentc6d1662b229410e64092fe3a9caed6535fb3dc65 (diff)
downloadop-kernel-dev-5852973c129cf7c7e6c229abb7250673fc2a50c9.zip
op-kernel-dev-5852973c129cf7c7e6c229abb7250673fc2a50c9.tar.gz
Merge branch 'for-2.6.29' into for-2.6.30
Diffstat (limited to 'include/sound/soc-dapm.h')
-rw-r--r--include/sound/soc-dapm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 075244e..0accdba 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -188,7 +188,7 @@
.private_value = (unsigned long)&xenum }
#define SOC_DAPM_VALUE_ENUM(xname, xenum) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
- .info = snd_soc_info_value_enum_double, \
+ .info = snd_soc_info_enum_double, \
.get = snd_soc_dapm_get_value_enum_double, \
.put = snd_soc_dapm_put_value_enum_double, \
.private_value = (unsigned long)&xenum }
OpenPOWER on IntegriCloud