projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'late/kirkwood' into late/soc
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap2
/
omap_hwmod_2xxx_ipblock_data.c
diff --git
a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
index
d59a9ce
..
35dcdb6
100644
(file)
--- a/
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
+++ b/
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
@@
-13,7
+13,7
@@
#include <linux/platform_data/gpio-omap.h>
#include <plat/dma.h>
#include <plat/dmtimer.h>
-#include <
plat/
mcspi.h>
+#include <
linux/platform_data/spi-omap2-
mcspi.h>
#include "omap_hwmod_common_data.h"
#include "cm-regbits-24xx.h"