diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-19 23:11:21 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-19 23:11:21 +1000 |
| commit | 143a1dec7e04e0a9712ff93e779aabfb21dfd97c (patch) | |
| tree | 3a60a4e630d792fb3cdc6e962ce0ecfd94bb2672 /arch/ppc64/kernel/pmac_nvram.c | |
| parent | 7ed476d17f04473f70d796cb6c172bdcfcc9b8e5 (diff) | |
| download | op-kernel-dev-143a1dec7e04e0a9712ff93e779aabfb21dfd97c.zip op-kernel-dev-143a1dec7e04e0a9712ff93e779aabfb21dfd97c.tar.gz | |
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 'arch/ppc64/kernel/pmac_nvram.c')
| -rw-r--r-- | arch/ppc64/kernel/pmac_nvram.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ppc64/kernel/pmac_nvram.c b/arch/ppc64/kernel/pmac_nvram.c index 11586d5..5fe9785 100644 --- a/arch/ppc64/kernel/pmac_nvram.c +++ b/arch/ppc64/kernel/pmac_nvram.c @@ -341,7 +341,7 @@ static int amd_write_bank(int bank, u8* datas) } -static int core99_nvram_sync(void) +static void core99_nvram_sync(void) { struct core99_header* hdr99; unsigned long flags; @@ -369,8 +369,6 @@ static int core99_nvram_sync(void) printk("nvram: Error writing bank %d\n", core99_bank); bail: spin_unlock_irqrestore(&nv_lock, flags); - - return 0; } int __init pmac_nvram_init(void) |
