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/ds12887.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/ds12887.c')
-rw-r--r-- | drivers/rtc/ds12887.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/rtc/ds12887.c b/drivers/rtc/ds12887.c index fb1825b..25ca133 100644 --- a/drivers/rtc/ds12887.c +++ b/drivers/rtc/ds12887.c @@ -154,7 +154,7 @@ else return 0; } -void rtc_set (struct rtc_time *tmp) +int rtc_set (struct rtc_time *tmp) { uchar save_ctrl_b; uchar sec, min, hour, mday, wday, mon, year; @@ -202,6 +202,8 @@ void rtc_set (struct rtc_time *tmp) /* enables the RTC to update the regs */ save_ctrl_b &= ~RTC_CB_SET; rtc_write(RTC_CONTROL_B, save_ctrl_b); + + return 0; } void rtc_reset (void) |