diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /include/asm-generic/rtc.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
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 | ||