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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap2
/
clock34xx.c
diff --git
a/arch/arm/mach-omap2/clock34xx.c
b/arch/arm/mach-omap2/clock34xx.c
index
6febd5f
..
287abc4
100644
(file)
--- a/
arch/arm/mach-omap2/clock34xx.c
+++ b/
arch/arm/mach-omap2/clock34xx.c
@@
-25,7
+25,7
@@
#include "clock.h"
#include "clock34xx.h"
-#include "cm.h"
+#include "cm
2xxx_3xxx
.h"
#include "cm-regbits-34xx.h"
/**