summaryrefslogtreecommitdiffstats
path: root/arch/sh/boards/mpc1211/rtc.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2006-09-27 17:11:32 +0900
committerPaul Mundt <lethal@linux-sh.org>2006-09-27 17:11:32 +0900
commitaf514ca7d27b31e3c278e1331f0ebdb3ad385a90 (patch)
treeaf5444786b8b9251e6a6f011ee71333025bb2c84 /arch/sh/boards/mpc1211/rtc.c
parent2991be725260d6fec11691a6138b9d71de949956 (diff)
downloadtalos-obmc-linux-af514ca7d27b31e3c278e1331f0ebdb3ad385a90.tar.gz
talos-obmc-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/mpc1211/rtc.c')
-rw-r--r--arch/sh/boards/mpc1211/rtc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/boards/mpc1211/rtc.c b/arch/sh/boards/mpc1211/rtc.c
index a76c655dceee..03b123a4bba4 100644
--- a/arch/sh/boards/mpc1211/rtc.c
+++ b/arch/sh/boards/mpc1211/rtc.c
@@ -130,7 +130,7 @@ int mpc1211_rtc_settimeofday(const struct timeval *tv)
void mpc1211_time_init(void)
{
- rtc_get_time = mpc1211_rtc_gettimeofday;
- rtc_set_time = mpc1211_rtc_settimeofday;
+ rtc_sh_get_time = mpc1211_rtc_gettimeofday;
+ rtc_sh_set_time = mpc1211_rtc_settimeofday;
}
OpenPOWER on IntegriCloud