diff options
author | Stefan Roese <sr@denx.de> | 2008-09-08 10:35:49 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2008-09-08 10:35:49 +0200 |
commit | c351575c226eaad85f12b0d346e762260b263531 (patch) | |
tree | c2c1748a95c589278cbf048c191728fd5a9ea753 /drivers/rtc/mcfrtc.c | |
parent | ac53ee8318678190bf3c68da477a84a657d86fb0 (diff) | |
parent | 302e52e0b1d4c7f994991709d0cb6c3ea612cdb5 (diff) | |
download | u-boot-imx-c351575c226eaad85f12b0d346e762260b263531.zip u-boot-imx-c351575c226eaad85f12b0d346e762260b263531.tar.gz u-boot-imx-c351575c226eaad85f12b0d346e762260b263531.tar.bz2 |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'drivers/rtc/mcfrtc.c')
-rw-r--r-- | drivers/rtc/mcfrtc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/rtc/mcfrtc.c b/drivers/rtc/mcfrtc.c index 30b2a81..c2af197 100644 --- a/drivers/rtc/mcfrtc.c +++ b/drivers/rtc/mcfrtc.c @@ -68,7 +68,7 @@ int rtc_get(struct rtc_time *tmp) return 0; } -void rtc_set(struct rtc_time *tmp) +int rtc_set(struct rtc_time *tmp) { volatile rtc_t *rtc = (rtc_t *) (CFG_MCFRTC_BASE); @@ -106,6 +106,8 @@ void rtc_set(struct rtc_time *tmp) rtc->days = days; rtc->hourmin = (tmp->tm_hour << 8) | tmp->tm_min; rtc->seconds = tmp->tm_sec; + + return 0; } void rtc_reset(void) |