diff options
| author | Daniel Mack <daniel@zonque.org> | 2018-06-27 21:33:53 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-29 12:05:03 +0100 |
| commit | 95acb005fef2aeaeb63c20de98aca0ed5bd0efa2 (patch) | |
| tree | 1d30139ddbb97d4ca3a3a74309e4aa42b7361e83 /sound/soc/pxa | |
| parent | 8f54061d001ad2da24dba89fc48adbbf4c85222b (diff) | |
| download | linux-95acb005fef2aeaeb63c20de98aca0ed5bd0efa2.tar.bz2 | |
ASoC: fold pxa2xx-pcm into its only user, pxa2xx-ac97
Now that the PXA SSP bits are ported over to generic DMA, the pxa2xx-pcm
code only has a single user left. This patch folds the remaining bits into
its only user and removes the unnecessary glue layer along with its header
file.
The include dependency to linux/dma/pxa-dma.h is also gone now.
Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/pxa-ssp.c | 1 | ||||
| -rw-r--r-- | sound/soc/pxa/pxa2xx-pcm.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 0b441338bdd4..c1f4af869289 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -34,7 +34,6 @@ #include <sound/pxa2xx-lib.h> #include <sound/dmaengine_pcm.h> -#include "../../arm/pxa2xx-pcm.h" #include "pxa-ssp.h" /* diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c index 8b6a70e94c01..445e691126e5 100644 --- a/sound/soc/pxa/pxa2xx-pcm.c +++ b/sound/soc/pxa/pxa2xx-pcm.c @@ -20,8 +20,6 @@ #include <sound/pxa2xx-lib.h> #include <sound/dmaengine_pcm.h> -#include "../../arm/pxa2xx-pcm.h" - static int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { |