summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-02-20 11:39:05 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-02-20 11:39:05 +1100
commitdffff02a6b10f25f879e1e523733770c0a492e76 (patch)
treea7f69af7963ece1afac5c76a902ce12dd5078294 /sound
parent877d66856e9de4a6d1ffbf61bec6f830bde4d3bf (diff)
parentfa59f178552f927bd96771ba84e9706655bea705 (diff)
downloadlinux-next-dffff02a6b10f25f879e1e523733770c0a492e76.tar.gz
Merge remote-tracking branch 'agust/next' into next
<< Please pull mpc5xxx patches for v3.9. The bestcomm driver is moved to drivers/dma (so it will be usable for ColdFire). mpc5121 now provides common dtsi file and existing mpc5121 device trees use it. There are some minor clock init and sparse fixes and updates for various 5200 device tree files from Grant. Some fixes for bugs in the mpc5121 DIU driver are also included here (Andrew Morton suggested to push them via my mpc5xxx tree). >>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/fsl/mpc5200_dma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index 9997c039bb24..2a847ca494b5 100644
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -14,8 +14,8 @@
#include <sound/soc.h>
-#include <sysdev/bestcomm/bestcomm.h>
-#include <sysdev/bestcomm/gen_bd.h>
+#include <linux/fsl/bestcomm/bestcomm.h>
+#include <linux/fsl/bestcomm/gen_bd.h>
#include <asm/mpc52xx_psc.h>
#include "mpc5200_dma.h"