diff options
Diffstat (limited to 'arch/powerpc/platforms/iseries/mf.c')
-rw-r--r-- | arch/powerpc/platforms/iseries/mf.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c index 3f25f7fc79fc..e5de31aa0015 100644 --- a/arch/powerpc/platforms/iseries/mf.c +++ b/arch/powerpc/platforms/iseries/mf.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
33 | #include <linux/dma-mapping.h> | 33 | #include <linux/dma-mapping.h> |
34 | #include <linux/bcd.h> | 34 | #include <linux/bcd.h> |
35 | #include <linux/rtc.h> | ||
35 | 36 | ||
36 | #include <asm/time.h> | 37 | #include <asm/time.h> |
37 | #include <asm/uaccess.h> | 38 | #include <asm/uaccess.h> |
@@ -1307,11 +1308,14 @@ int iSeries_set_rtc_time(struct rtc_time *tm) | |||
1307 | return 0; | 1308 | return 0; |
1308 | } | 1309 | } |
1309 | 1310 | ||
1310 | void iSeries_get_boot_time(struct rtc_time *tm) | 1311 | unsigned long iSeries_get_boot_time(void) |
1311 | { | 1312 | { |
1313 | struct rtc_time tm; | ||
1314 | |||
1312 | if (piranha_simulator) | 1315 | if (piranha_simulator) |
1313 | return; | 1316 | return 0; |
1314 | 1317 | ||
1315 | mf_get_boot_rtc(tm); | 1318 | mf_get_boot_rtc(&tm); |
1316 | tm->tm_mon -= 1; | 1319 | return mktime(tm.tm_year + 1900, tm.tm_mon, tm.tm_mday, |
1320 | tm.tm_hour, tm.tm_min, tm.tm_sec); | ||
1317 | } | 1321 | } |