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 'old_next' into next
[pandora-kernel.git]
/
arch
/
arm
/
mach-mxs
/
include
/
mach
/
common.h
diff --git
a/arch/arm/mach-mxs/include/mach/common.h
b/arch/arm/mach-mxs/include/mach/common.h
index
59133eb
..
635bb5d
100644
(file)
--- a/
arch/arm/mach-mxs/include/mach/common.h
+++ b/
arch/arm/mach-mxs/include/mach/common.h
@@
-13,6
+13,7
@@
struct clk;
+extern const u32 *mxs_get_ocotp(void);
extern int mxs_reset_block(void __iomem *);
extern void mxs_timer_init(struct clk *, int);