aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sh
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-06-17 20:36:50 -0400
committerPaul Mundt <lethal@linux-sh.org>2008-07-28 05:10:30 -0400
commit4c1cfab1e0f9a41246cfdcca78f3700fb67f0a5c (patch)
tree502610786625ef7fe15d89e4226cd05b6dcd2d44 /include/asm-sh
parent62410034e79d9249647d1fe6f6f35a06b3747e68 (diff)
sh/kernel/ cleanups
This patch contains the following cleanups: - make the following needlessly global code static: - cf-enabler.c: cf_init() - cpu/clock.c: __clk_enable() - cpu/clock.c: __clk_disable() - process_32.c: default_idle() - time_32.c: struct clocksource_sh - timers/timer-tmu.c: struct tmu_timer_ops - remove the following unused functions (no CONFIG_BLK_DEV_FD on sh): - process_{32,64}.c: disable_hlt() - process_{32,64}.c: enable_hlt() Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/asm-sh')
-rw-r--r--include/asm-sh/clock.h3
-rw-r--r--include/asm-sh/system.h8
-rw-r--r--include/asm-sh/timer.h1
3 files changed, 0 insertions, 12 deletions
diff --git a/include/asm-sh/clock.h b/include/asm-sh/clock.h
index b550a27a7042..608fda55c0ea 100644
--- a/include/asm-sh/clock.h
+++ b/include/asm-sh/clock.h
@@ -41,9 +41,6 @@ void arch_init_clk_ops(struct clk_ops **, int type);
41/* arch/sh/kernel/cpu/clock.c */ 41/* arch/sh/kernel/cpu/clock.c */
42int clk_init(void); 42int clk_init(void);
43 43
44int __clk_enable(struct clk *);
45void __clk_disable(struct clk *);
46
47void clk_recalc_rate(struct clk *); 44void clk_recalc_rate(struct clk *);
48 45
49int clk_register(struct clk *); 46int clk_register(struct clk *);
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h
index e65b6b822cb3..056d68cd2108 100644
--- a/include/asm-sh/system.h
+++ b/include/asm-sh/system.h
@@ -148,14 +148,6 @@ extern unsigned long cached_to_uncached;
148 148
149extern struct dentry *sh_debugfs_root; 149extern struct dentry *sh_debugfs_root;
150 150
151/* XXX
152 * disable hlt during certain critical i/o operations
153 */
154#define HAVE_DISABLE_HLT
155void disable_hlt(void);
156void enable_hlt(void);
157
158void default_idle(void);
159void per_cpu_trap_init(void); 151void per_cpu_trap_init(void);
160 152
161asmlinkage void break_point_trap(void); 153asmlinkage void break_point_trap(void);
diff --git a/include/asm-sh/timer.h b/include/asm-sh/timer.h
index 701ba84c7049..327f7eb8976a 100644
--- a/include/asm-sh/timer.h
+++ b/include/asm-sh/timer.h
@@ -40,6 +40,5 @@ struct sys_timer *get_sys_timer(void);
40/* arch/sh/kernel/time.c */ 40/* arch/sh/kernel/time.c */
41void handle_timer_tick(void); 41void handle_timer_tick(void);
42extern unsigned long sh_hpt_frequency; 42extern unsigned long sh_hpt_frequency;
43extern struct clocksource clocksource_sh;
44 43
45#endif /* __ASM_SH_TIMER_H */ 44#endif /* __ASM_SH_TIMER_H */