From: Javier Martin <javier.martin@vista-silicon.com>
Date: Thu, 22 Mar 2012 13:54:15 +0000 (+0100)
Subject: dmaengine: i.MX: Fix merge of cookie branch.
X-Git-Tag: v3.4-rc1~39^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=660cd0dd94eba5201c69cd10f2d2fefb52807fa8;p=pandora-kernel.git

dmaengine: i.MX: Fix merge of cookie branch.

When merging DMA cookie changes a small chunk
of code was dropped. This broke imx-dma driver.

This patch adds this chunk again and fixes the problem.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
---

Reading git-diff-tree failed