diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-07-26 11:47:05 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-07-26 11:47:05 -0400 |
| commit | 636f78581dbd5529a52057973fe2bdfc1c2f528e (patch) | |
| tree | 90ac0777cea7818b050cace6c459e7abd73b4cbe /include/sound | |
| parent | 56487c279fe9fc23c5f15e2b935eb896ab7ba280 (diff) | |
| parent | a0c27ab2421c47dc7c53f797fffcc0d17cdb122c (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dapm.h | 6 |
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 @@ | |||
| 266 | .get = snd_soc_dapm_get_enum_virt, \ | 266 | .get = snd_soc_dapm_get_enum_virt, \ |
| 267 | .put = snd_soc_dapm_put_enum_virt, \ | 267 | .put = snd_soc_dapm_put_enum_virt, \ |
| 268 | .private_value = (unsigned long)&xenum } | 268 | .private_value = (unsigned long)&xenum } |
| 269 | #define SOC_DAPM_ENUM_EXT(xname, xenum, xget, xput) \ | ||
| 270 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ | ||
| 271 | .info = snd_soc_info_enum_double, \ | ||
| 272 | .get = xget, \ | ||
| 273 | .put = xput, \ | ||
| 274 | .private_value = (unsigned long)&xenum } | ||
| 269 | #define SOC_DAPM_VALUE_ENUM(xname, xenum) \ | 275 | #define SOC_DAPM_VALUE_ENUM(xname, xenum) \ |
| 270 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ | 276 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ |
| 271 | .info = snd_soc_info_enum_double, \ | 277 | .info = snd_soc_info_enum_double, \ |