diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-11-25 04:53:27 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-11-25 04:53:27 -0500 |
| commit | 058250a0d5886b4d96a195ecc7e3a75e2df5e4b1 (patch) | |
| tree | fb67e8f5258c6aa11d4e8c39650e23de7556b38d /drivers/rtc/hctosys.c | |
| parent | cea218054ad277d6c126890213afde07b4eb1602 (diff) | |
| parent | 2ffbb8377c7a0713baf6644e285adc27a5654582 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/rtc/hctosys.c')
| -rw-r--r-- | drivers/rtc/hctosys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/hctosys.c b/drivers/rtc/hctosys.c index 178527252c6a..33c0e98243ee 100644 --- a/drivers/rtc/hctosys.c +++ b/drivers/rtc/hctosys.c | |||
| @@ -47,8 +47,8 @@ static int __init rtc_hctosys(void) | |||
| 47 | do_settimeofday(&tv); | 47 | do_settimeofday(&tv); |
| 48 | 48 | ||
| 49 | dev_info(rtc->dev.parent, | 49 | dev_info(rtc->dev.parent, |
| 50 | "setting the system clock to " | 50 | "setting system clock to " |
| 51 | "%d-%02d-%02d %02d:%02d:%02d (%u)\n", | 51 | "%d-%02d-%02d %02d:%02d:%02d UTC (%u)\n", |
| 52 | tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, | 52 | tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, |
| 53 | tm.tm_hour, tm.tm_min, tm.tm_sec, | 53 | tm.tm_hour, tm.tm_min, tm.tm_sec, |
| 54 | (unsigned int) tv.tv_sec); | 54 | (unsigned int) tv.tv_sec); |