diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-19 17:11:21 +0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-19 17:11:21 +0400 |
| commit | 143a1dec7e04e0a9712ff93e779aabfb21dfd97c (patch) | |
| tree | 3a60a4e630d792fb3cdc6e962ce0ecfd94bb2672 /include/asm-powerpc/rtas.h | |
| parent | 7ed476d17f04473f70d796cb6c172bdcfcc9b8e5 (diff) | |
| download | linux-143a1dec7e04e0a9712ff93e779aabfb21dfd97c.tar.xz | |
powerpc: Merge machdep.h
A few things change for consistency between ppc32 and ppc64:
idle functions return void; *_get_boot_time functions return
unsigned long (i.e. time_t) rather than filling in a struct rtc_time
(since that's useful to the callers and easier for pmac to
generate); *_get_rtc_time and *_set_rtc_time functions take
a struct rtc_time; irq_canonicalize is gone; nvram_sync returns
void.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/rtas.h')
| -rw-r--r-- | include/asm-powerpc/rtas.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/rtas.h b/include/asm-powerpc/rtas.h index 5c904d371963..2c050332471d 100644 --- a/include/asm-powerpc/rtas.h +++ b/include/asm-powerpc/rtas.h @@ -190,7 +190,7 @@ extern void rtas_progress(char *s, unsigned short hex); extern void rtas_initialize(void); struct rtc_time; -extern void rtas_get_boot_time(struct rtc_time *rtc_time); +extern unsigned long rtas_get_boot_time(void); extern void rtas_get_rtc_time(struct rtc_time *rtc_time); extern int rtas_set_rtc_time(struct rtc_time *rtc_time); |