diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-08-25 07:32:39 +0900 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-08-25 08:46:16 +0200 |
commit | 0ceb4c3e3f1ccaf121851e33c3ea269b8ad0f219 (patch) | |
tree | 7cf6e8054e4fa09ba28d3f2906d4846fb8b68eef /arch/sh/kernel/time.c | |
parent | d90246cd8e0141332a8ab09c3c1800cc2028a686 (diff) | |
download | op-kernel-dev-0ceb4c3e3f1ccaf121851e33c3ea269b8ad0f219.zip op-kernel-dev-0ceb4c3e3f1ccaf121851e33c3ea269b8ad0f219.tar.gz |
timekeeping: Fix up read_persistent_clock() breakage on sh
The recent commit "timekeeping: Increase granularity of
read_persistent_clock()" introduced read_persistent_clock()
rework which inadvertently broke the sh conversion:
arch/sh/kernel/time.c:45: error: passing argument 1 of 'rtc_sh_get_time' from incompatible pointer type
distcc[13470] ERROR: compile arch/sh/kernel/time.c on sprygo/32 failed
make[2]: *** [arch/sh/kernel/time.o] Error 1
This trivial fix gets it working again.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
LKML-Reference: <20090824223239.GB20832@linux-sh.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/kernel/time.c')
-rw-r--r-- | arch/sh/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index 3f4706a..0e0e858 100644 --- a/arch/sh/kernel/time.c +++ b/arch/sh/kernel/time.c @@ -41,7 +41,7 @@ int (*rtc_sh_set_time)(const time_t) = null_rtc_set_time; #ifdef CONFIG_GENERIC_CMOS_UPDATE void read_persistent_clock(struct timespec *ts) { - rtc_sh_get_time(&ts); + rtc_sh_get_time(ts); } int update_persistent_clock(struct timespec now) |