diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-04 11:31:17 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-04 11:31:17 -0400 |
| commit | 7196be58ca832b6b37965921714849276f8996bc (patch) | |
| tree | 2529b7a696cd2ceaaa9a6e3095496ae672111a20 /include/sound | |
| parent | a1cb98ac8b6980fcd530271c739c3dd7436a91aa (diff) | |
| parent | 0e400c53812e11442785019de7df02e6adc71311 (diff) | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 50ff6f3459aa..27ed5ccb174a 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
| @@ -248,6 +248,8 @@ | |||
| 248 | .info = snd_soc_info_enum_double, \ | 248 | .info = snd_soc_info_enum_double, \ |
| 249 | .get = xhandler_get, .put = xhandler_put, \ | 249 | .get = xhandler_get, .put = xhandler_put, \ |
| 250 | .private_value = (unsigned long)&xenum } | 250 | .private_value = (unsigned long)&xenum } |
| 251 | #define SOC_VALUE_ENUM_EXT(xname, xenum, xhandler_get, xhandler_put) \ | ||
| 252 | SOC_ENUM_EXT(xname, xenum, xhandler_get, xhandler_put) | ||
| 251 | 253 | ||
| 252 | #define SND_SOC_BYTES(xname, xbase, xregs) \ | 254 | #define SND_SOC_BYTES(xname, xbase, xregs) \ |
| 253 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ | 255 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ |