Merge 'next' branch

[platform/kernel/u-boot.git] / cpu / s3c44b0 / cpu.c

diff --git a/cpu/s3c44b0/cpu.c b/cpu/s3c44b0/cpu.c
index 5d50b3c..fd09bf9 100644 (file)
--- a/cpu/s3c44b0/cpu.c
+++ b/cpu/s3c44b0/cpu.c
@@ -155,7 +155,7 @@ int dcache_status (void)
        #define HEX2BCD(x) ((((x) / 10) << 4) + (x) % 10)
 #endif
 
-void rtc_get (struct rtc_time* tm)
+int rtc_get (struct rtc_time* tm)
 {
        RTCCON |= 1;
        tm->tm_year  = BCD2HEX(BCDYEAR);
@@ -184,9 +184,11 @@ void rtc_get (struct rtc_time* tm)
                tm->tm_year += 1900;
        else
                tm->tm_year += 2000;
+
+       return 0;
 }
 
-void rtc_set (struct rtc_time* tm)
+int rtc_set (struct rtc_time* tm)
 {
        if(tm->tm_year < 2000)
                tm->tm_year -= 1900;
@@ -202,6 +204,8 @@ void rtc_set (struct rtc_time* tm)
        BCDMIN = HEX2BCD(tm->tm_min);
        BCDSEC = HEX2BCD(tm->tm_sec);
        RTCCON &= 1;
+
+       return 0;
 }
 
 void rtc_reset (void)