diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-23 00:47:29 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-23 00:47:29 -0400 |
| commit | bd072111e7319d90a7b8127f91c2806b9a6f279e (patch) | |
| tree | 1686978814a2387ebfc16f9f5778a7f0caaf319b /include/asm-generic/rtc.h | |
| parent | 24d01c0681bfbc10a99304c48a89ad213d2d7a4b (diff) | |
| parent | 4be3bd7849165e7efa6b0b35a23d6a3598d97465 (diff) | |
Merge commit 'v2.6.31-rc4' into next
Diffstat (limited to 'include/asm-generic/rtc.h')
| -rw-r--r-- | include/asm-generic/rtc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h index 763e3b060f43..fa86f240c874 100644 --- a/include/asm-generic/rtc.h +++ b/include/asm-generic/rtc.h | |||
| @@ -202,7 +202,7 @@ static inline unsigned int get_rtc_ss(void) | |||
| 202 | { | 202 | { |
| 203 | struct rtc_time h; | 203 | struct rtc_time h; |
| 204 | 204 | ||
| 205 | __get_rtc_time(&h); | 205 | get_rtc_time(&h); |
| 206 | return h.tm_sec; | 206 | return h.tm_sec; |
| 207 | } | 207 | } |
| 208 | 208 | ||