ASoC: Merge branch 'for-2.6.39' into for-2.6.40

[karo-tx-linux.git] / sound / soc / imx / imx-ssi.c

diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c
index ac2ded969253895a0b5df067922e91b1678a12a7..5b13feca753732a6664969308e0794b161936aa8 100644 (file)
--- a/sound/soc/imx/imx-ssi.c
+++ b/sound/soc/imx/imx-ssi.c
@@ -667,12 +667,6 @@ static int imx_ssi_probe(struct platform_device *pdev)
        if (res)
                ssi->dma_params_rx.dma = res->start;
 
-       if ((cpu_is_mx27() || cpu_is_mx21()) &&
-                       !(ssi->flags & IMX_SSI_USE_AC97) &&
-                       (ssi->flags & IMX_SSI_DMA)) {
-               ssi->flags |= IMX_SSI_DMA;
-       }
-
        platform_set_drvdata(pdev, ssi);
 
        ret = snd_soc_register_dai(&pdev->dev, dai);