From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Mon, 30 Mar 2015 17:54:54 +0000 (+0200)
Subject: ASoC: atmel-pcm-pdc: merge atmel-pcm back in
X-Git-Tag: omap-for-v4.2/o2_dc~120^2~1^2~8^6~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=488cb533911b96fe41af68a0206878aa46b799bc;p=pandora-kernel.git

ASoC: atmel-pcm-pdc: merge atmel-pcm back in

atmel-pcm.c was split into two files to create a generic framework for both PDC
and DMA.

atmel-pcm-dma.c is using the generic dmaengine framework since 95e0e07e710e
(ASoC: atmel-pcm: use generic dmaengine framework).

Merge atmel-pcm.c in atmel-pcm-pdc.c as this is now the only user.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

Reading git-diff-tree failed