Merge tag 'asoc-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

ASoC: More updates for v3.11

Some more fixes and enhancements, and also a bunch of refectoring for
AC'97 support which enables more than one AC'97 controller driver to be
built in.

diff --cc sound/soc/blackfin/bf5xx-ac97.c
Simple merge

diff --cc sound/soc/cirrus/ep93xx-ac97.c
index 3f4f88877c8424eb771a0d8d84aa459dabc87ae9,4bc9490e2c8480a752250503a014f720a2766174..ac73c607410a73d92ff84a817c22bf6a99c25d5f
--- 1/sound/soc/cirrus/ep93xx-ac97.c
--- 2/sound/soc/cirrus/ep93xx-ac97.c
+++ b/sound/soc/cirrus/ep93xx-ac97.c
@@@ -397,8 -406,9 +400,8 @@@ static int ep93xx_ac97_probe(struct pla
        return 0;
  
  fail:
 -      platform_set_drvdata(pdev, NULL);
        ep93xx_ac97_info = NULL;
-       dev_set_drvdata(&pdev->dev, NULL);
+       snd_soc_set_ac97_ops(NULL);
        return ret;
  }
  
@@@ -411,8 -421,10 +414,9 @@@ static int ep93xx_ac97_remove(struct pl
        /* disable the AC97 controller */
        ep93xx_ac97_write_reg(info, AC97GCR, 0);
  
 -      platform_set_drvdata(pdev, NULL);
        ep93xx_ac97_info = NULL;
-       dev_set_drvdata(&pdev->dev, NULL);
+ 
+       snd_soc_set_ac97_ops(NULL);
  
        return 0;
  }

diff --cc sound/soc/codecs/88pm860x-codec.c
Simple merge

diff --cc sound/soc/codecs/wm8994.c
Simple merge

diff --cc sound/soc/fsl/imx-ssi.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge