diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-15 01:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-15 01:55:58 +0000 |
| commit | 53b3988d474435254a3b053a68bb24ce9e439295 (patch) | |
| tree | f8da8e40f01f4ad02bbd76b8c9920749b118235f /arch/ppc/kernel/chrp_time.c | |
| parent | b0cb48abe83d1a4389ea938bf624f8baa82c5047 (diff) | |
Merge with 2.3.99-pre9.
Diffstat (limited to 'arch/ppc/kernel/chrp_time.c')
| -rw-r--r-- | arch/ppc/kernel/chrp_time.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/ppc/kernel/chrp_time.c b/arch/ppc/kernel/chrp_time.c index c692b54d0..6d275e517 100644 --- a/arch/ppc/kernel/chrp_time.c +++ b/arch/ppc/kernel/chrp_time.c @@ -25,6 +25,7 @@ #include <asm/processor.h> #include <asm/nvram.h> #include <asm/prom.h> +#include <asm/init.h> #include "time.h" static int nvram_as1 = NVRAM_AS1; @@ -45,7 +46,7 @@ void __init chrp_time_init(void) nvram_data = base + 1; } -int chrp_cmos_clock_read(int addr) +int __chrp chrp_cmos_clock_read(int addr) { if (nvram_as1 != 0) outb(addr>>8, nvram_as1); @@ -53,7 +54,7 @@ int chrp_cmos_clock_read(int addr) return (inb(nvram_data)); } -void chrp_cmos_clock_write(unsigned long val, int addr) +void __chrp chrp_cmos_clock_write(unsigned long val, int addr) { if (nvram_as1 != 0) outb(addr>>8, nvram_as1); @@ -65,7 +66,7 @@ void chrp_cmos_clock_write(unsigned long val, int addr) /* * Set the hardware clock. -- Cort */ -int chrp_set_rtc_time(unsigned long nowtime) +int __chrp chrp_set_rtc_time(unsigned long nowtime) { unsigned char save_control, save_freq_select; struct rtc_time tm; @@ -111,7 +112,7 @@ int chrp_set_rtc_time(unsigned long nowtime) return 0; } -unsigned long chrp_get_rtc_time(void) +unsigned long __chrp chrp_get_rtc_time(void) { unsigned int year, mon, day, hour, min, sec; int i; |