Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux...

diff --combined sound/soc/imx/eukrea-tlv320.c
index a08e822,1e9bcca..75fb4b8
--- 1/sound/soc/imx/eukrea-tlv320.c
--- 2/sound/soc/imx/eukrea-tlv320.c
+++ b/sound/soc/imx/eukrea-tlv320.c
@@@ -79,7 -79,7 +79,7 @@@ static struct snd_soc_dai_link eukrea_t
        .name           = "tlv320aic23",
        .stream_name    = "TLV320AIC23",
        .codec_dai_name = "tlv320aic23-hifi",
-       .platform_name  = "imx-pcm-audio.0",
+       .platform_name  = "imx-fiq-pcm-audio.0",
        .codec_name     = "tlv320aic23-codec.0-001a",
        .cpu_dai_name   = "imx-ssi.0",
        .ops            = &eukrea_tlv320_snd_ops,
@@@ -98,8 -98,7 +98,8 @@@ static int __init eukrea_tlv320_init(vo
        int ret;
  
        if (!machine_is_eukrea_cpuimx27() && !machine_is_eukrea_cpuimx25sd()
 -              && !machine_is_eukrea_cpuimx35sd())
 +              && !machine_is_eukrea_cpuimx35sd()
 +              && !machine_is_eukrea_cpuimx51sd())
                /* return happy. We might run on a totally different machine */
                return 0;