diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
| commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
| tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /include/asm-powerpc/time.h | |
| parent | a300bec952127d9a15e666b391bb35c9aecb3002 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'include/asm-powerpc/time.h')
| -rw-r--r-- | include/asm-powerpc/time.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h index ce5de6e0e690..febd581ec9b0 100644 --- a/include/asm-powerpc/time.h +++ b/include/asm-powerpc/time.h | |||
| @@ -33,6 +33,7 @@ extern unsigned tb_to_us; | |||
| 33 | 33 | ||
| 34 | struct rtc_time; | 34 | struct rtc_time; |
| 35 | extern void to_tm(int tim, struct rtc_time * tm); | 35 | extern void to_tm(int tim, struct rtc_time * tm); |
| 36 | extern void GregorianDay(struct rtc_time *tm); | ||
| 36 | extern time_t last_rtc_update; | 37 | extern time_t last_rtc_update; |
| 37 | 38 | ||
| 38 | extern void generic_calibrate_decr(void); | 39 | extern void generic_calibrate_decr(void); |