git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
omap_hwmod_2xxx_interconnect_data.c
diff --git
a/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
b/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
index 9b30b6b471ae3bb274aa32be7cc625af96ca80dd..e19f620c407453d2d002fdcf446cb35471b4ff19 100644
(file)
--- a/
arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
+++ b/
arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
@@
-11,7
+11,7
@@
* XXX handle crossbar/shared link difference for L3?
* XXX these should be marked initdata for multi-OMAP kernels
*/
-#include <
asm
/sizes.h>
+#include <
linux
/sizes.h>
#include "omap_hwmod.h"
#include "l3_2xxx.h"