git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[pandora-kernel.git]
/
sound
/
soc
/
fsl
/
imx-pcm-dma.c
diff --git
a/sound/soc/fsl/imx-pcm-dma.c
b/sound/soc/fsl/imx-pcm-dma.c
index
48f9d88
..
89a7755
100644
(file)
--- a/
sound/soc/fsl/imx-pcm-dma.c
+++ b/
sound/soc/fsl/imx-pcm-dma.c
@@
-30,7
+30,7
@@
#include <sound/soc.h>
#include <sound/dmaengine_pcm.h>
-#include <
mach/dma
.h>
+#include <
linux/platform_data/dma-imx
.h>
#include "imx-pcm.h"