projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...
[deliverable/linux.git]
/
arch
/
arm
/
mach-omap2
/
omap_hwmod_2xxx_3xxx_ipblock_data.c
diff --git
a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
index 40d6c93d98530cd673b3ba1ff29245a94a79b3da..534974e08add21655fbea5fe647c45670c2e0102 100644
(file)
--- a/
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
+++ b/
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
@@
-10,7
+10,8
@@
* published by the Free Software Foundation.
*/
-#include <plat-omap/dma-omap.h>
+#include <linux/dmaengine.h>
+#include <linux/omap-dma.h>
#include "omap_hwmod.h"
#include "hdq1w.h"
This page took
0.024334 seconds
and
5
git commands to generate.