diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2005-06-23 01:43:07 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-06-23 01:43:07 +0200 |
| commit | 10f7e7c15e6ce41799c5dba6925ae4bf8048c870 (patch) | |
| tree | 505c9834749cd59bd8a075db7577c3b26a002f92 /arch/ppc64/kernel/iSeries_setup.c | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-10f7e7c15e6ce41799c5dba6925ae4bf8048c870.tar.xz linux-10f7e7c15e6ce41799c5dba6925ae4bf8048c870.zip | |
[PATCH] ppc64: consolidate calibrate_decr implementations
pSeries and maple have almost the same code for calibrate_decr,
and BPA would need yet another copy. Instead, I'm moving the
code to arch/ppc64/kernel/time.c.
Some of the related declarations were missing from header
files, so I'm moving those as well.
It makes sense to merge this with the pmac function of the
same name, so we end up having just one implemetation for
iSeries and one for Open Firmware based machines.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/iSeries_setup.c')
| -rw-r--r-- | arch/ppc64/kernel/iSeries_setup.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/ppc64/kernel/iSeries_setup.c b/arch/ppc64/kernel/iSeries_setup.c index b31962436fe3..86966ce76b58 100644 --- a/arch/ppc64/kernel/iSeries_setup.c +++ b/arch/ppc64/kernel/iSeries_setup.c @@ -671,9 +671,6 @@ static void __init iSeries_bolt_kernel(unsigned long saddr, unsigned long eaddr) } } -extern unsigned long ppc_proc_freq; -extern unsigned long ppc_tb_freq; - /* * Document me. */ @@ -772,8 +769,6 @@ static void iSeries_halt(void) mf_power_off(); } -extern void setup_default_decr(void); - /* * void __init iSeries_calibrate_decr() * |