From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 28 Jan 2014 20:45:38 +0000 (+0100)
Subject: dmaengine: mmp_pdma: fix mismerge
X-Git-Tag: v3.14-rc1~48^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15cec530e4bc7bed3f51cde8404f96fd28a8c7c5;p=pandora-kernel.git

dmaengine: mmp_pdma: fix mismerge

The merge between 2b7f65b11d87f "mmp_pdma: Style neatening" and
8010dad55a0ab0 "dma: add dma_get_any_slave_channel(), for use in of_xlate()"
caused a build error by leaving obsolete code in place:

  mmp_pdma.c: In function 'mmp_pdma_dma_xlate':
  mmp_pdma.c:909:31: error: 'candidate' undeclared
  mmp_pdma.c:912:3: error: label 'retry' used but not defined
  mmp_pdma.c:901:24: warning: unused variable 'c' [-Wunused-variable]

This removes the extraneous lines.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---

Reading git-diff-tree failed