diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-09 06:03:55 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-09 06:03:55 -0500 |
| commit | 5852973c129cf7c7e6c229abb7250673fc2a50c9 (patch) | |
| tree | ce61401fc06a086309d496ae2e015d7d3b504ab8 /include/sound/soc-dapm.h | |
| parent | 3e8e1952e3a3dd59b11233a532ca68e6471742d9 (diff) | |
| parent | c6d1662b229410e64092fe3a9caed6535fb3dc65 (diff) | |
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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 075244ef41eb..0accdba211f9 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
| @@ -188,7 +188,7 @@ | |||
| 188 | .private_value = (unsigned long)&xenum } | 188 | .private_value = (unsigned long)&xenum } |
| 189 | #define SOC_DAPM_VALUE_ENUM(xname, xenum) \ | 189 | #define SOC_DAPM_VALUE_ENUM(xname, xenum) \ |
| 190 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ | 190 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ |
| 191 | .info = snd_soc_info_value_enum_double, \ | 191 | .info = snd_soc_info_enum_double, \ |
| 192 | .get = snd_soc_dapm_get_value_enum_double, \ | 192 | .get = snd_soc_dapm_get_value_enum_double, \ |
| 193 | .put = snd_soc_dapm_put_value_enum_double, \ | 193 | .put = snd_soc_dapm_put_value_enum_double, \ |
| 194 | .private_value = (unsigned long)&xenum } | 194 | .private_value = (unsigned long)&xenum } |