diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-01-29 00:45:38 +0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-01-29 16:08:57 +0400 |
| commit | 15cec530e4bc7bed3f51cde8404f96fd28a8c7c5 (patch) | |
| tree | 731235fab2ca0bef5ef782deeb8d1421cf39dbb4 /drivers/gpu/drm/armada/armada_fbdev.c | |
| parent | 6d05c9fabfdc8642b42a1000cd092b2a7543d85f (diff) | |
| download | linux-15cec530e4bc7bed3f51cde8404f96fd28a8c7c5.tar.xz | |
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>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_fbdev.c')
0 files changed, 0 insertions, 0 deletions