diff options
| author | Andi Kleen <andi@basil.nowhere.org> | 2006-11-28 14:12:29 -0500 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-11-28 14:12:29 -0500 |
| commit | a3550a9c543556cf7764be81aeb17c6dab440753 (patch) | |
| tree | e8c8bf721cc917c8842c4a007ad4b3f68eb7aa1e /include/asm-powerpc/time.h | |
| parent | 9a14f2964b459c18198ee59ff7212321def82df7 (diff) | |
| parent | 2ea5814472c3c910aed5c5b60f1f3b1000e353f1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-powerpc/time.h')
| -rw-r--r-- | include/asm-powerpc/time.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h index a78285010d62..4cff977ad526 100644 --- a/include/asm-powerpc/time.h +++ b/include/asm-powerpc/time.h | |||
| @@ -39,10 +39,6 @@ extern void generic_calibrate_decr(void); | |||
| 39 | extern void wakeup_decrementer(void); | 39 | extern void wakeup_decrementer(void); |
| 40 | extern void snapshot_timebase(void); | 40 | extern void snapshot_timebase(void); |
| 41 | 41 | ||
| 42 | #ifdef CONFIG_RTC_CLASS | ||
| 43 | extern int __init rtc_class_hookup(void); | ||
| 44 | #endif | ||
| 45 | |||
| 46 | /* Some sane defaults: 125 MHz timebase, 1GHz processor */ | 42 | /* Some sane defaults: 125 MHz timebase, 1GHz processor */ |
| 47 | extern unsigned long ppc_proc_freq; | 43 | extern unsigned long ppc_proc_freq; |
| 48 | #define DEFAULT_PROC_FREQ (DEFAULT_TB_FREQ * 8) | 44 | #define DEFAULT_PROC_FREQ (DEFAULT_TB_FREQ * 8) |