diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-12 08:05:50 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-12 08:05:50 -0500 |
| commit | 9229f43f48d1b454a4e8b83985d0195b1760a550 (patch) | |
| tree | 603bbbffb49d3243997de39310ce4c55861ddc92 /include/sound/soc-dapm.h | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
| parent | c6d1662b229410e64092fe3a9caed6535fb3dc65 (diff) | |
Merge branch 'topic/asoc' into for-linus
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 4af1083e3287..93a4edb148b5 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
| @@ -178,7 +178,7 @@ | |||
| 178 | .private_value = (unsigned long)&xenum } | 178 | .private_value = (unsigned long)&xenum } |
| 179 | #define SOC_DAPM_VALUE_ENUM(xname, xenum) \ | 179 | #define SOC_DAPM_VALUE_ENUM(xname, xenum) \ |
| 180 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ | 180 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ |
| 181 | .info = snd_soc_info_value_enum_double, \ | 181 | .info = snd_soc_info_enum_double, \ |
| 182 | .get = snd_soc_dapm_get_value_enum_double, \ | 182 | .get = snd_soc_dapm_get_value_enum_double, \ |
| 183 | .put = snd_soc_dapm_put_value_enum_double, \ | 183 | .put = snd_soc_dapm_put_value_enum_double, \ |
| 184 | .private_value = (unsigned long)&xenum } | 184 | .private_value = (unsigned long)&xenum } |