summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-07-26 17:47:05 +0200
committerTakashi Iwai <tiwai@suse.de>2011-07-26 17:47:05 +0200
commit636f78581dbd5529a52057973fe2bdfc1c2f528e (patch)
tree90ac0777cea7818b050cace6c459e7abd73b4cbe /include/sound
parentALSA: hda - Cirrus Logic CS421x support (diff)
parentASoC: Revert "ASoC: SAMSUNG: Add I2S0 internal dma driver" (diff)
downloadlinux-636f78581dbd5529a52057973fe2bdfc1c2f528e.tar.xz
linux-636f78581dbd5529a52057973fe2bdfc1c2f528e.zip
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc-dapm.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index e09505c5a490..e0583b7769cb 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -266,6 +266,12 @@
.get = snd_soc_dapm_get_enum_virt, \
.put = snd_soc_dapm_put_enum_virt, \
.private_value = (unsigned long)&xenum }
+#define SOC_DAPM_ENUM_EXT(xname, xenum, xget, xput) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+ .info = snd_soc_info_enum_double, \
+ .get = xget, \
+ .put = xput, \
+ .private_value = (unsigned long)&xenum }
#define SOC_DAPM_VALUE_ENUM(xname, xenum) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
.info = snd_soc_info_enum_double, \