diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-25 17:36:02 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-25 17:36:02 +0100 |
commit | 456ba5a7802e58eccb5aa9751b3ab515ef99b9ca (patch) | |
tree | 4ca4dd3726b34dead51af13b67475af7bf857893 /sound/soc/pxa/mmp-pcm.c | |
parent | 05304949332c6d2c7b50f2d0f666a52369f09ced (diff) | |
parent | 79748cdb39dbf914bc5f26c75cfd5f91d84d82c9 (diff) |
Merge remote-tracking branches 'asoc/fix/ux500' and 'asoc/fix/wm8994' into for-3.7
Diffstat (limited to 'sound/soc/pxa/mmp-pcm.c')
-rw-r--r-- | sound/soc/pxa/mmp-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c index 73ac5463c9e..e834faf859f 100644 --- a/sound/soc/pxa/mmp-pcm.c +++ b/sound/soc/pxa/mmp-pcm.c @@ -15,13 +15,13 @@ #include <linux/slab.h> #include <linux/dma-mapping.h> #include <linux/dmaengine.h> +#include <linux/platform_data/dma-mmp_tdma.h> #include <linux/platform_data/mmp_audio.h> #include <sound/pxa2xx-lib.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> -#include <mach/sram.h> #include <sound/dmaengine_pcm.h> struct mmp_dma_data { |