git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
clkt2xxx_osc.c
diff --git
a/arch/arm/mach-omap2/clkt2xxx_osc.c
b/arch/arm/mach-omap2/clkt2xxx_osc.c
index
2167be8
..
df7b805
100644
(file)
--- a/
arch/arm/mach-omap2/clkt2xxx_osc.c
+++ b/
arch/arm/mach-omap2/clkt2xxx_osc.c
@@
-27,7
+27,7
@@
#include "clock.h"
#include "clock2xxx.h"
-#include "prm.h"
+#include "prm
2xxx_3xxx
.h"
#include "prm-regbits-24xx.h"
static int omap2_enable_osc_ck(struct clk *clk)