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
Merge git://git.infradead.org/battery-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-davinci
/
clock.h
diff --git
a/arch/arm/mach-davinci/clock.h
b/arch/arm/mach-davinci/clock.h
index 35736ec202f82ec7bdb570c13ea2bf931c7aa55e..27233cb4a2fbeeaca1e66a9bff1a1d96f4e36734 100644
(file)
--- a/
arch/arm/mach-davinci/clock.h
+++ b/
arch/arm/mach-davinci/clock.h
@@
-67,6
+67,7
@@
struct clk {
u8 usecount;
u8 flags;
u8 lpsc;
+ u8 psc_ctlr;
struct clk *parent;
struct pll_data *pll_data;
u32 div_reg;
@@
-93,4
+94,7
@@
struct davinci_clk {
}
int davinci_clk_init(struct davinci_clk *clocks);
+
+extern struct platform_device davinci_wdt_device;
+
#endif