diff options
| author | Arnd Bergmann | 2005-06-23 01:43:07 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2005-06-23 01:43:07 +0200 |
| commit | 10f7e7c15e6ce41799c5dba6925ae4bf8048c870 (patch) | |
| tree | 505c9834749cd59bd8a075db7577c3b26a002f92 /arch/ppc64/kernel/maple_setup.c | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | kernel-qcow2-linux-10f7e7c15e6ce41799c5dba6925ae4bf8048c870.tar.gz kernel-qcow2-linux-10f7e7c15e6ce41799c5dba6925ae4bf8048c870.tar.xz kernel-qcow2-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/maple_setup.c')
| -rw-r--r-- | arch/ppc64/kernel/maple_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/maple_setup.c b/arch/ppc64/kernel/maple_setup.c index 8cf95a27178e..3dabedb8553b 100644 --- a/arch/ppc64/kernel/maple_setup.c +++ b/arch/ppc64/kernel/maple_setup.c @@ -235,6 +235,6 @@ struct machdep_calls __initdata maple_md = { .get_boot_time = maple_get_boot_time, .set_rtc_time = maple_set_rtc_time, .get_rtc_time = maple_get_rtc_time, - .calibrate_decr = maple_calibrate_decr, + .calibrate_decr = generic_calibrate_decr, .progress = maple_progress, }; |