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_2430_data.c
diff --git
a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index dc768c50e523d4c49dda1a0580a5c3d089424103..6c8fa70ddaddad333545bb10a9e5d5bfe4204950 100644
(file)
--- a/
arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/
arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@
-16,8
+16,7
@@
#include <linux/i2c-omap.h>
#include <linux/platform_data/asoc-ti-mcbsp.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
-
-#include <plat-omap/dma-omap.h>
+#include <linux/omap-dma.h>
#include <plat/dmtimer.h>
#include "omap_hwmod.h"
This page took
0.024979 seconds
and
5
git commands to generate.