diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 17:32:24 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 17:32:24 -0400 |
| commit | a348a7e6fdbcd2d5192a09719a479bb238fde727 (patch) | |
| tree | 5ff94185f4e5a810777469d7fe7832a8ec2d3430 /arch/arm/mach-davinci/clock.h | |
| parent | 808347f6a31792079e345ec865e9cfcb6e8ae6b2 (diff) | |
| parent | 28d0325ce6e0a52f53d8af687e6427fee59004d3 (diff) | |
Merge commit 'v2.6.31-rc1' into dmaengine
Diffstat (limited to 'arch/arm/mach-davinci/clock.h')
| -rw-r--r-- | arch/arm/mach-davinci/clock.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/clock.h b/arch/arm/mach-davinci/clock.h index 35736ec202f8..27233cb4a2fb 100644 --- a/arch/arm/mach-davinci/clock.h +++ b/arch/arm/mach-davinci/clock.h | |||
| @@ -67,6 +67,7 @@ struct clk { | |||
| 67 | u8 usecount; | 67 | u8 usecount; |
| 68 | u8 flags; | 68 | u8 flags; |
| 69 | u8 lpsc; | 69 | u8 lpsc; |
| 70 | u8 psc_ctlr; | ||
| 70 | struct clk *parent; | 71 | struct clk *parent; |
| 71 | struct pll_data *pll_data; | 72 | struct pll_data *pll_data; |
| 72 | u32 div_reg; | 73 | u32 div_reg; |
| @@ -93,4 +94,7 @@ struct davinci_clk { | |||
| 93 | } | 94 | } |
| 94 | 95 | ||
| 95 | int davinci_clk_init(struct davinci_clk *clocks); | 96 | int davinci_clk_init(struct davinci_clk *clocks); |
| 97 | |||
| 98 | extern struct platform_device davinci_wdt_device; | ||
| 99 | |||
| 96 | #endif | 100 | #endif |