summaryrefslogtreecommitdiffstats
path: root/include/asm-sh/rtc.h
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 /include/asm-sh/rtc.h
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 'include/asm-sh/rtc.h')
-rw-r--r--include/asm-sh/rtc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sh/rtc.h b/include/asm-sh/rtc.h
index cea9cdf9b925..4c7be859c9c0 100644
--- a/include/asm-sh/rtc.h
+++ b/include/asm-sh/rtc.h
@@ -8,8 +8,8 @@
extern void sh_rtc_gettimeofday(struct timespec *ts);
extern int sh_rtc_settimeofday(const time_t secs);
extern void (*board_time_init)(void);
-extern void (*rtc_get_time)(struct timespec *);
-extern int (*rtc_set_time)(const time_t);
+extern void (*rtc_sh_get_time)(struct timespec *);
+extern int (*rtc_sh_set_time)(const time_t);
/* RCR1 Bits */
#define RCR1_CF 0x80 /* Carry Flag */