diff options
| author | Paul Mackerras | 2005-10-20 01:23:26 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2005-10-20 01:23:26 +0200 |
| commit | f2783c15007468c14972e2617db51e9affc7fad9 (patch) | |
| tree | 6c8f57ee8e5cdaeb810a3ccf7f697576a7df7615 /arch/ppc64/kernel/pmac_time.c | |
| parent | ppc64: Minor compilation fixes (diff) | |
| download | kernel-qcow2-linux-f2783c15007468c14972e2617db51e9affc7fad9.tar.gz kernel-qcow2-linux-f2783c15007468c14972e2617db51e9affc7fad9.tar.xz kernel-qcow2-linux-f2783c15007468c14972e2617db51e9affc7fad9.zip | |
powerpc: Merge time.c and asm/time.h.
We now use the merged time.c for both 32-bit and 64-bit compilation
with ARCH=powerpc, and for ARCH=ppc64, but not for ARCH=ppc32.
This removes setup_default_decr (folds its function into time_init)
and moves wakeup_decrementer into time.c. This also makes an
asm-powerpc/rtc.h.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/pmac_time.c')
| -rw-r--r-- | arch/ppc64/kernel/pmac_time.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/pmac_time.c b/arch/ppc64/kernel/pmac_time.c index c89bfefbbecd..56f335115916 100644 --- a/arch/ppc64/kernel/pmac_time.c +++ b/arch/ppc64/kernel/pmac_time.c @@ -180,7 +180,5 @@ void __init pmac_calibrate_decr(void) if (fp == 0) panic("can't get cpu processor frequency"); ppc_proc_freq = *fp; - - setup_default_decr(); } |