projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
[linux-2.6-block.git]
/
sound
/
soc
/
omap
/
omap-mcbsp.c
diff --git
a/sound/soc/omap/omap-mcbsp.c
b/sound/soc/omap/omap-mcbsp.c
index 45be94201c89747080df9eb9d322165c33097b2f..6bbbd2ab0ee7c48f29e79b9ad77d8386dce3da6b 100644
(file)
--- a/
sound/soc/omap/omap-mcbsp.c
+++ b/
sound/soc/omap/omap-mcbsp.c
@@
-31,9
+31,9
@@
#include <sound/initval.h>
#include <sound/soc.h>
-#include <
mach
/control.h>
-#include <
mach
/dma.h>
-#include <
mach
/mcbsp.h>
+#include <
plat
/control.h>
+#include <
plat
/dma.h>
+#include <
plat
/mcbsp.h>
#include "omap-mcbsp.h"
#include "omap-pcm.h"