diff options
| author | Paul Mackerras | 2005-09-25 14:51:50 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2005-09-25 14:51:50 +0200 |
| commit | e5baa396af7560382d2cf3f0871d616b61fc284c (patch) | |
| tree | 6afc166894b8c8b3b2cf6add72a726be14ae2443 /arch/ppc64/kernel/pmac_time.c | |
| parent | [PATCH] powerpc: merge semaphore.h (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-ucb (diff) | |
| download | kernel-qcow2-linux-e5baa396af7560382d2cf3f0871d616b61fc284c.tar.gz kernel-qcow2-linux-e5baa396af7560382d2cf3f0871d616b61fc284c.tar.xz kernel-qcow2-linux-e5baa396af7560382d2cf3f0871d616b61fc284c.zip | |
Merge from Linus' tree.
Diffstat (limited to 'arch/ppc64/kernel/pmac_time.c')
| -rw-r--r-- | arch/ppc64/kernel/pmac_time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/pmac_time.c b/arch/ppc64/kernel/pmac_time.c index 6c8c99295e7a..9d8c97decd32 100644 --- a/arch/ppc64/kernel/pmac_time.c +++ b/arch/ppc64/kernel/pmac_time.c @@ -84,7 +84,7 @@ void pmac_get_rtc_time(struct rtc_time *tm) #ifdef CONFIG_PMAC_SMU case SYS_CTRLER_SMU: - smu_get_rtc_time(tm); + smu_get_rtc_time(tm, 1); break; #endif /* CONFIG_PMAC_SMU */ default: @@ -128,7 +128,7 @@ int pmac_set_rtc_time(struct rtc_time *tm) #ifdef CONFIG_PMAC_SMU case SYS_CTRLER_SMU: - return smu_set_rtc_time(tm); + return smu_set_rtc_time(tm, 1); #endif /* CONFIG_PMAC_SMU */ default: return -ENODEV; |