diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-25 06:58:19 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-25 06:58:19 +0900 |
| commit | 3070fb888be52c5488976828ffc9f950872ffadc (patch) | |
| tree | de59e3130d6e715a45199bf28e10d43d2ec570b1 /Documentation/DocBook | |
| parent | 68ca92aa1f980d91ac98f798b313b70864f60e4b (diff) | |
| parent | dfcd6e438927ad8c54278e5b1a34a4fe76e57ad2 (diff) | |
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: clkfwk: Build fix for non-legacy CPG changes.
sh: Use GCC __builtin_prefetch() to implement prefetch().
sh: fix vsyscall compilation due to .eh_frame issue
sh: avoid to flush all cache in sys_cacheflush
sh: clkfwk: Disable init clk op for non-legacy clocks.
sh: clkfwk: Kill off now unused algo_id in set_rate op.
sh: clkfwk: Kill off unused clk_set_rate_ex().
Diffstat (limited to 'Documentation/DocBook')
| -rw-r--r-- | Documentation/DocBook/sh.tmpl | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/DocBook/sh.tmpl b/Documentation/DocBook/sh.tmpl index d858d92cf6d..4a38f604fa6 100644 --- a/Documentation/DocBook/sh.tmpl +++ b/Documentation/DocBook/sh.tmpl @@ -79,10 +79,6 @@ </sect2> </sect1> </chapter> - <chapter id="clk"> - <title>Clock Framework Extensions</title> -!Iinclude/linux/sh_clk.h - </chapter> <chapter id="mach"> <title>Machine Specific Interfaces</title> <sect1 id="dreamcast"> |