summaryrefslogtreecommitdiffstats
path: root/drivers/rtc/ds1556.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-09-08 10:35:49 +0200
committerStefan Roese <sr@denx.de>2008-09-08 10:35:49 +0200
commitc351575c226eaad85f12b0d346e762260b263531 (patch)
treec2c1748a95c589278cbf048c191728fd5a9ea753 /drivers/rtc/ds1556.c
parentac53ee8318678190bf3c68da477a84a657d86fb0 (diff)
parent302e52e0b1d4c7f994991709d0cb6c3ea612cdb5 (diff)
downloadtalos-obmc-uboot-c351575c226eaad85f12b0d346e762260b263531.tar.gz
talos-obmc-uboot-c351575c226eaad85f12b0d346e762260b263531.zip
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'drivers/rtc/ds1556.c')
-rw-r--r--drivers/rtc/ds1556.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/rtc/ds1556.c b/drivers/rtc/ds1556.c
index f95f28ed49..7574626173 100644
--- a/drivers/rtc/ds1556.c
+++ b/drivers/rtc/ds1556.c
@@ -120,7 +120,7 @@ int rtc_get( struct rtc_time *tmp )
return 0;
}
-void rtc_set( struct rtc_time *tmp )
+int rtc_set( struct rtc_time *tmp )
{
uchar reg_a;
#ifdef RTC_DEBUG
@@ -146,6 +146,8 @@ void rtc_set( struct rtc_time *tmp )
/* unlock clock registers after read */
rtc_write( RTC_CONTROLA, ( reg_a & ~RTC_CA_WRITE ));
+
+ return 0;
}
void rtc_reset (void)
OpenPOWER on IntegriCloud