diff options
Diffstat (limited to 'include/asm-sh')
-rw-r--r-- | include/asm-sh/clock.h | 3 | ||||
-rw-r--r-- | include/asm-sh/system.h | 8 | ||||
-rw-r--r-- | include/asm-sh/timer.h | 1 |
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 */ |
42 | int clk_init(void); | 42 | int clk_init(void); |
43 | 43 | ||
44 | int __clk_enable(struct clk *); | ||
45 | void __clk_disable(struct clk *); | ||
46 | |||
47 | void clk_recalc_rate(struct clk *); | 44 | void clk_recalc_rate(struct clk *); |
48 | 45 | ||
49 | int clk_register(struct clk *); | 46 | int 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 | ||
149 | extern struct dentry *sh_debugfs_root; | 149 | extern struct dentry *sh_debugfs_root; |
150 | 150 | ||
151 | /* XXX | ||
152 | * disable hlt during certain critical i/o operations | ||
153 | */ | ||
154 | #define HAVE_DISABLE_HLT | ||
155 | void disable_hlt(void); | ||
156 | void enable_hlt(void); | ||
157 | |||
158 | void default_idle(void); | ||
159 | void per_cpu_trap_init(void); | 151 | void per_cpu_trap_init(void); |
160 | 152 | ||
161 | asmlinkage void break_point_trap(void); | 153 | asmlinkage 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 */ |
41 | void handle_timer_tick(void); | 41 | void handle_timer_tick(void); |
42 | extern unsigned long sh_hpt_frequency; | 42 | extern unsigned long sh_hpt_frequency; |
43 | extern struct clocksource clocksource_sh; | ||
44 | 43 | ||
45 | #endif /* __ASM_SH_TIMER_H */ | 44 | #endif /* __ASM_SH_TIMER_H */ |