git.stricted.de - GitHub/moto-9609/android_kernel_motorola

author	Alexandre Belloni <alexandre.belloni@free-electrons.com>
	Mon, 30 Mar 2015 17:54:54 +0000 (19:54 +0200)
committer	Mark Brown <broonie@kernel.org>
	Wed, 1 Apr 2015 20:24:27 +0000 (21:24 +0100)
commit	488cb533911b96fe41af68a0206878aa46b799bc
tree	85d6408a59f870a79df3dfa62aaf4d235a8b6787	tree \| snapshot (tar.gz zip)
parent	b6d6c6e95ff0e78f9b8393e6b9f25d5a4341ae1a	commit \| diff

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>

sound/soc/atmel/Makefile		diff \| blob \| blame \| history
sound/soc/atmel/atmel-pcm-pdc.c		diff \| blob \| blame \| history
sound/soc/atmel/atmel-pcm.c	[deleted file]	blob \| blame \| history
sound/soc/atmel/atmel-pcm.h		diff \| blob \| blame \| history