diff options
| author | Igor Mammedov <niallain@gmail.com> | 2008-04-28 19:08:21 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-28 19:08:21 -0400 |
| commit | e9f20d6f03e8df393b001dab6dc5226c2a5daf57 (patch) | |
| tree | 73e94fa5e4f83576c97e36187b809c5aad2ade30 /drivers/rtc/rtc-sh.c | |
| parent | bf62fd887cab230f5952b611bde25e8e15acb454 (diff) | |
| parent | e31a94ed371c70855eb30b77c490d6d85dd4da26 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/rtc/rtc-sh.c')
| -rw-r--r-- | drivers/rtc/rtc-sh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index c594b34c6767..110699bb4787 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c | |||
| @@ -361,7 +361,7 @@ static int sh_rtc_read_time(struct device *dev, struct rtc_time *tm) | |||
| 361 | 361 | ||
| 362 | dev_dbg(dev, "%s: tm is secs=%d, mins=%d, hours=%d, " | 362 | dev_dbg(dev, "%s: tm is secs=%d, mins=%d, hours=%d, " |
| 363 | "mday=%d, mon=%d, year=%d, wday=%d\n", | 363 | "mday=%d, mon=%d, year=%d, wday=%d\n", |
| 364 | __FUNCTION__, | 364 | __func__, |
| 365 | tm->tm_sec, tm->tm_min, tm->tm_hour, | 365 | tm->tm_sec, tm->tm_min, tm->tm_hour, |
| 366 | tm->tm_mday, tm->tm_mon + 1, tm->tm_year, tm->tm_wday); | 366 | tm->tm_mday, tm->tm_mon + 1, tm->tm_year, tm->tm_wday); |
| 367 | 367 | ||