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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap2
/
sram34xx.S
diff --git
a/arch/arm/mach-omap2/sram34xx.S
b/arch/arm/mach-omap2/sram34xx.S
index
2d0ceaa
..
1446331
100644
(file)
--- a/
arch/arm/mach-omap2/sram34xx.S
+++ b/
arch/arm/mach-omap2/sram34xx.S
@@
-32,7
+32,7
@@
#include "soc.h"
#include "iomap.h"
#include "sdrc.h"
-#include "cm
2xxx_
3xxx.h"
+#include "cm3xxx.h"
/*
* This file needs be built unconditionally as ARM to interoperate correctly