From 8e1f58836f222f32a11654d7cc15b69b97c4d869 Mon Sep 17 00:00:00 2001
From: Wolfram Sang <w.sang@pengutronix.de>
Date: Fri, 25 Mar 2011 16:51:46 +0100
Subject: [PATCH] --- yaml --- r: 248205 b: refs/heads/master c:
 8b573c95d7bd1cf28c69ab4e0255cd272d214482 h: refs/heads/master i:   248203:
 ef0f6fc7b6010e0f6e8467e24b3dcc39d91476ce v: v3

---
 [refs]                        | 2 +-
 trunk/sound/soc/imx/imx-ssi.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ade64d555814..b126e2782dce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0b1550677a4449a57a32ebc167cba552da9871e
+refs/heads/master: 8b573c95d7bd1cf28c69ab4e0255cd272d214482
diff --git a/trunk/sound/soc/imx/imx-ssi.c b/trunk/sound/soc/imx/imx-ssi.c
index bc92ec620004..c331d65587d8 100644
--- a/trunk/sound/soc/imx/imx-ssi.c
+++ b/trunk/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);