Merge branch 'for-3.5' into asoc-next

Conflicts:
	sound/soc/blackfin/bf5xx-ssm2602.c

diff --cc sound/soc/blackfin/bf5xx-ssm2602.c
index b39ad356b92b84e2d649c0ea986c2ba23aecbac9,911edbab134543a0986fb53f0b5a1b60d0f625b2..7dbeef1099b48de868d3fd724c93db45a64a0206
--- 1/sound/soc/blackfin/bf5xx-ssm2602.c
--- 2/sound/soc/blackfin/bf5xx-ssm2602.c
+++ b/sound/soc/blackfin/bf5xx-ssm2602.c
@@@ -98,8 -69,7 +69,8 @@@ static struct snd_soc_dai_link bf5xx_ss
                .codec_dai_name = "ssm2602-hifi",
                .platform_name = "bfin-i2s-pcm-audio",
                .codec_name = "ssm2602.0-001b",
-               .ops = &bf5xx_ssm2602_ops,
+               .init = bf5xx_ssm2602_dai_init,
 +              .dai_fmt = BF5XX_SSM2602_DAIFMT,
        },
        {
                .name = "ssm2602",
@@@ -108,8 -78,7 +79,8 @@@
                .codec_dai_name = "ssm2602-hifi",
                .platform_name = "bfin-i2s-pcm-audio",
                .codec_name = "ssm2602.0-001b",
-               .ops = &bf5xx_ssm2602_ops,
+               .init = bf5xx_ssm2602_dai_init,
 +              .dai_fmt = BF5XX_SSM2602_DAIFMT,
        },
  };