summaryrefslogtreecommitdiffstats
path: root/arch/sh/boards/landisk
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2006-09-27 10:11:32 +0200
committerPaul Mundt <lethal@linux-sh.org>2006-09-27 10:11:32 +0200
commitaf514ca7d27b31e3c278e1331f0ebdb3ad385a90 (patch)
treeaf5444786b8b9251e6a6f011ee71333025bb2c84 /arch/sh/boards/landisk
parentsh: Fixup __strnlen_user() behaviour. (diff)
downloadlinux-af514ca7d27b31e3c278e1331f0ebdb3ad385a90.tar.xz
linux-af514ca7d27b31e3c278e1331f0ebdb3ad385a90.zip
sh: Rename rtc_get/set_time() to avoid RTC_CLASS conflict.
We have a clash with RTC_CLASS over these names, so we change them.. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/landisk')
-rw-r--r--arch/sh/boards/landisk/rtc.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/arch/sh/boards/landisk/rtc.c b/arch/sh/boards/landisk/rtc.c
index d666aa63303f..35ba726a0979 100644
--- a/arch/sh/boards/landisk/rtc.c
+++ b/arch/sh/boards/landisk/rtc.c
@@ -16,17 +16,9 @@
#include <linux/time.h>
#include <linux/delay.h>
#include <linux/spinlock.h>
+#include <linux/bcd.h>
+#include <asm/rtc.h>
-#ifndef BCD_TO_BIN
-#define BCD_TO_BIN(val) ((val)=((val)&15) + ((val)>>4)*10)
-#endif
-
-#ifndef BIN_TO_BCD
-#define BIN_TO_BCD(val) ((val)=(((val)/10)<<4) + (val)%10)
-#endif
-
-extern void (*rtc_get_time) (struct timespec *);
-extern int (*rtc_set_time) (const time_t);
extern spinlock_t rtc_lock;
extern void
@@ -94,9 +86,8 @@ int landisk_rtc_settimeofday(const time_t secs)
return retval;
}
-
void landisk_time_init(void)
{
- rtc_get_time = landisk_rtc_gettimeofday;
- rtc_set_time = landisk_rtc_settimeofday;
+ rtc_sh_get_time = landisk_rtc_gettimeofday;
+ rtc_sh_set_time = landisk_rtc_settimeofday;
}