diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 05:42:25 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 05:42:25 -0400 |
commit | a71ba09655d197f22938fffa6f5d210ff5134f98 (patch) | |
tree | 8698d0adaba7dbdcde93d94bb92c8d76136bd0f5 | |
parent | b9e3fc29c08a6dcbe19606cfba19c1fcc0551ed7 (diff) |
sh: fixup the docbook paths for clock framework shuffling.
Now that the definitions have been consolidated in an alternate header,
update the template accordingly.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | Documentation/DocBook/sh.tmpl | 10 | ||||
-rw-r--r-- | include/linux/sh_clk.h | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Documentation/DocBook/sh.tmpl b/Documentation/DocBook/sh.tmpl index 0c3dc4c69dd1..d858d92cf6d9 100644 --- a/Documentation/DocBook/sh.tmpl +++ b/Documentation/DocBook/sh.tmpl | |||
@@ -19,13 +19,17 @@ | |||
19 | </authorgroup> | 19 | </authorgroup> |
20 | 20 | ||
21 | <copyright> | 21 | <copyright> |
22 | <year>2008</year> | 22 | <year>2008-2010</year> |
23 | <holder>Paul Mundt</holder> | 23 | <holder>Paul Mundt</holder> |
24 | </copyright> | 24 | </copyright> |
25 | <copyright> | 25 | <copyright> |
26 | <year>2008</year> | 26 | <year>2008-2010</year> |
27 | <holder>Renesas Technology Corp.</holder> | 27 | <holder>Renesas Technology Corp.</holder> |
28 | </copyright> | 28 | </copyright> |
29 | <copyright> | ||
30 | <year>2010</year> | ||
31 | <holder>Renesas Electronics Corp.</holder> | ||
32 | </copyright> | ||
29 | 33 | ||
30 | <legalnotice> | 34 | <legalnotice> |
31 | <para> | 35 | <para> |
@@ -77,7 +81,7 @@ | |||
77 | </chapter> | 81 | </chapter> |
78 | <chapter id="clk"> | 82 | <chapter id="clk"> |
79 | <title>Clock Framework Extensions</title> | 83 | <title>Clock Framework Extensions</title> |
80 | !Iarch/sh/include/asm/clock.h | 84 | !Iinclude/linux/sh_clk.h |
81 | </chapter> | 85 | </chapter> |
82 | <chapter id="mach"> | 86 | <chapter id="mach"> |
83 | <title>Machine Specific Interfaces</title> | 87 | <title>Machine Specific Interfaces</title> |
diff --git a/include/linux/sh_clk.h b/include/linux/sh_clk.h index 6d7de242be1d..1636d1e2a5f1 100644 --- a/include/linux/sh_clk.h +++ b/include/linux/sh_clk.h | |||
@@ -46,7 +46,7 @@ struct clk { | |||
46 | 46 | ||
47 | #define CLK_ENABLE_ON_INIT (1 << 0) | 47 | #define CLK_ENABLE_ON_INIT (1 << 0) |
48 | 48 | ||
49 | /* arch/sh/kernel/cpu/clock.c */ | 49 | /* drivers/sh/clk.c */ |
50 | unsigned long followparent_recalc(struct clk *); | 50 | unsigned long followparent_recalc(struct clk *); |
51 | void recalculate_root_clocks(void); | 51 | void recalculate_root_clocks(void); |
52 | void propagate_rate(struct clk *); | 52 | void propagate_rate(struct clk *); |
@@ -55,7 +55,6 @@ int clk_register(struct clk *); | |||
55 | void clk_unregister(struct clk *); | 55 | void clk_unregister(struct clk *); |
56 | void clk_enable_init_clocks(void); | 56 | void clk_enable_init_clocks(void); |
57 | 57 | ||
58 | /* the exported API, in addition to clk_set_rate */ | ||
59 | /** | 58 | /** |
60 | * clk_set_rate_ex - set the clock rate for a clock source, with additional parameter | 59 | * clk_set_rate_ex - set the clock rate for a clock source, with additional parameter |
61 | * @clk: clock source | 60 | * @clk: clock source |