Merge branch 'for-2.6.29' into for-2.6.30
Mark Brown [Fri, 9 Jan 2009 11:03:55 +0000 (11:03 +0000)]
1  2 
include/sound/soc-dapm.h
include/sound/soc.h
sound/soc/codecs/twl4030.c
sound/soc/soc-core.c
sound/soc/soc-dapm.c

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1073,15 -988,8 +1011,9 @@@ static int snd_soc_dapm_add_route(struc
                if (ret != 0)
                        goto err;
                break;
-       case snd_soc_dapm_value_mux:
-               ret = dapm_connect_value_mux(codec, wsource, wsink, path,
-                       control, &wsink->kcontrols[0]);
-               if (ret != 0)
-                       goto err;
-               break;
        case snd_soc_dapm_switch:
        case snd_soc_dapm_mixer:
 +      case snd_soc_dapm_mixer_named_ctl:
                ret = dapm_connect_mixer(codec, wsource, wsink, path, control);
                if (ret != 0)
                        goto err;