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
Pull pvops into release branch
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
clock.h
diff --git
a/arch/arm/plat-mxc/include/mach/clock.h
b/arch/arm/plat-mxc/include/mach/clock.h
index d21f78e7881945e094be4953d461cd5986688ee9..43a82d0c534dd8f1e4bdfc99a95c94e9c1e56413 100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/clock.h
+++ b/
arch/arm/plat-mxc/include/mach/clock.h
@@
-26,9
+26,13
@@
struct module;
struct clk {
struct module;
struct clk {
+#ifndef CONFIG_COMMON_CLKDEV
+ /* As soon as i.MX1 and i.MX31 switched to clkdev, this
+ * block can go away */
struct list_head node;
struct module *owner;
const char *name;
struct list_head node;
struct module *owner;
const char *name;
+#endif
int id;
/* Source clock this clk depends on */
struct clk *parent;
int id;
/* Source clock this clk depends on */
struct clk *parent;
@@
-63,5
+67,7
@@
struct clk {
int clk_register(struct clk *clk);
void clk_unregister(struct clk *clk);
int clk_register(struct clk *clk);
void clk_unregister(struct clk *clk);
+unsigned long mxc_decode_pll(unsigned int pll, u32 f_ref);
+
#endif /* __ASSEMBLY__ */
#endif /* __ASM_ARCH_MXC_CLOCK_H__ */
#endif /* __ASSEMBLY__ */
#endif /* __ASM_ARCH_MXC_CLOCK_H__ */