]> err.no Git - linux-2.6/commit
powerpc: Merge machdep.h
authorPaul Mackerras <paulus@samba.org>
Wed, 19 Oct 2005 13:11:21 +0000 (23:11 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 19 Oct 2005 13:11:21 +0000 (23:11 +1000)
commit143a1dec7e04e0a9712ff93e779aabfb21dfd97c
tree3a60a4e630d792fb3cdc6e962ce0ecfd94bb2672
parent7ed476d17f04473f70d796cb6c172bdcfcc9b8e5
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>
17 files changed:
arch/powerpc/platforms/iseries/mf.c
arch/powerpc/platforms/iseries/setup.c
arch/powerpc/platforms/iseries/setup.h
arch/powerpc/platforms/powermac/pmac.h
arch/powerpc/platforms/powermac/setup.c
arch/powerpc/platforms/powermac/time.c
arch/powerpc/platforms/pseries/setup.c
arch/ppc64/kernel/idle.c
arch/ppc64/kernel/maple_setup.c
arch/ppc64/kernel/maple_time.c
arch/ppc64/kernel/pmac.h
arch/ppc64/kernel/pmac_nvram.c
arch/ppc64/kernel/pmac_time.c
arch/ppc64/kernel/rtas-proc.c
arch/ppc64/kernel/rtc.c
include/asm-powerpc/machdep.h [moved from include/asm-ppc64/machdep.h with 59% similarity]
include/asm-powerpc/rtas.h