Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 191715
b: refs/heads/master
c: a71ba09
h: refs/heads/master
i:
  191713: 991c6c3
  191711: fe32039
v: v3
  • Loading branch information
Paul Mundt committed May 13, 2010
1 parent 1dcc3cd commit 8f63514
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b9e3fc29c08a6dcbe19606cfba19c1fcc0551ed7
refs/heads/master: a71ba09655d197f22938fffa6f5d210ff5134f98
10 changes: 7 additions & 3 deletions trunk/Documentation/DocBook/sh.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,17 @@
</authorgroup>

<copyright>
<year>2008</year>
<year>2008-2010</year>
<holder>Paul Mundt</holder>
</copyright>
<copyright>
<year>2008</year>
<year>2008-2010</year>
<holder>Renesas Technology Corp.</holder>
</copyright>
<copyright>
<year>2010</year>
<holder>Renesas Electronics Corp.</holder>
</copyright>

<legalnotice>
<para>
Expand Down Expand Up @@ -77,7 +81,7 @@
</chapter>
<chapter id="clk">
<title>Clock Framework Extensions</title>
!Iarch/sh/include/asm/clock.h
!Iinclude/linux/sh_clk.h
</chapter>
<chapter id="mach">
<title>Machine Specific Interfaces</title>
Expand Down
3 changes: 1 addition & 2 deletions trunk/include/linux/sh_clk.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ struct clk {

#define CLK_ENABLE_ON_INIT (1 << 0)

/* arch/sh/kernel/cpu/clock.c */
/* drivers/sh/clk.c */
unsigned long followparent_recalc(struct clk *);
void recalculate_root_clocks(void);
void propagate_rate(struct clk *);
Expand All @@ -55,7 +55,6 @@ int clk_register(struct clk *);
void clk_unregister(struct clk *);
void clk_enable_init_clocks(void);

/* the exported API, in addition to clk_set_rate */
/**
* clk_set_rate_ex - set the clock rate for a clock source, with additional parameter
* @clk: clock source
Expand Down

0 comments on commit 8f63514

Please sign in to comment.