OSDN Git Service

(root) / uclinux-h8 / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b6d6c6e) | patch
ASoC: atmel-pcm-pdc: merge atmel-pcm back in
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>
Mon, 30 Mar 2015 17:54:54 +0000 (19:54 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 1 Apr 2015 20:24:27 +0000 (21:24 +0100)
commit488cb533911b96fe41af68a0206878aa46b799bc
tree85d6408a59f870a79df3dfa62aaf4d235a8b6787tree | snapshot
parentb6d6c6e95ff0e78f9b8393e6b9f25d5a4341ae1acommit | 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 | history
sound/soc/atmel/atmel-pcm-pdc.c diff | blob | history
sound/soc/atmel/atmel-pcm.c [deleted file] blob | history
sound/soc/atmel/atmel-pcm.h diff | blob | history
About OSDN
Find Software
Develop Software
Help