Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[sfrench/cifs-2.6.git] / arch / sh / boards / mpc1211 / rtc.c

diff --git a/arch/sh/boards/mpc1211/rtc.c b/arch/sh/boards/mpc1211/rtc.c
index a76c655dceeeba4790a2654b03e525f824bf24ee..03b123a4bba42d54bd2757dc514da30fe1f7a998 100644 (file)
--- 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;
 }