From be551c5dcc130a3ea536b2e53b4c6d80301c3802 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 3 Mar 2009 11:28:34 +0000 Subject: ASoC: Add Openmoko state file compatibility for DAPM switches Openmoko had similar controls with "DAPM " prefixed to them - add that back to maintain compatibility with existing ALSA state files. Signed-off-by: Mark Brown --- include/sound/soc-dapm.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 3cc7d57981d..40e764fa95d 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -182,8 +182,11 @@ .get = snd_soc_dapm_get_value_enum_double, \ .put = snd_soc_dapm_put_value_enum_double, \ .private_value = (unsigned long)&xenum } +/* NOTE: Openmoko-specific "DAPM " prefix added to controls for + * backwards compatibility. + */ #define SOC_DAPM_PIN_SWITCH(xname) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname " Switch", \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "DAPM " xname " Switch", \ .info = snd_soc_dapm_info_pin_switch, \ .get = snd_soc_dapm_get_pin_switch, \ .put = snd_soc_dapm_put_pin_switch, \ -- cgit v1.2.3