diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /arch/sh/boards/mpc1211/rtc.c | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/sh/boards/mpc1211/rtc.c')
| -rw-r--r-- | arch/sh/boards/mpc1211/rtc.c | 4 |
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) | |||
| 130 | 130 | ||
| 131 | void mpc1211_time_init(void) | 131 | void mpc1211_time_init(void) |
| 132 | { | 132 | { |
| 133 | rtc_get_time = mpc1211_rtc_gettimeofday; | 133 | rtc_sh_get_time = mpc1211_rtc_gettimeofday; |
| 134 | rtc_set_time = mpc1211_rtc_settimeofday; | 134 | rtc_sh_set_time = mpc1211_rtc_settimeofday; |
| 135 | } | 135 | } |
| 136 | 136 | ||