diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-21 21:42:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-21 21:42:44 -0500 |
| commit | 0f9005a6f7a82f4aacbd72f7b92322a8ca1c3f97 (patch) | |
| tree | 8b63f4a8add7f1bfbba02f9ddbbe26e7943afb21 /include | |
| parent | c5dd27337a70b34cc400120e70a80fcb84c4fd7a (diff) | |
| parent | 8746ed3dae14e87e9f7ad8e44649b72e22b33274 (diff) | |
Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix ucc_geth of_device discovery on mpc832x
[POWERPC] Revert "[POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class"
[POWERPC] Revert "[POWERPC] Enable generic rtc hook for the MPC8349 mITX"
Diffstat (limited to 'include')
| -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) |