diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
| commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
| tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /include/linux/time.h | |
| parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
| parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'include/linux/time.h')
| -rw-r--r-- | include/linux/time.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index ce321ac5c8f8..fbbd2a1c92ba 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
| @@ -105,6 +105,7 @@ extern unsigned long read_persistent_clock(void); | |||
| 105 | extern int update_persistent_clock(struct timespec now); | 105 | extern int update_persistent_clock(struct timespec now); |
| 106 | extern int no_sync_cmos_clock __read_mostly; | 106 | extern int no_sync_cmos_clock __read_mostly; |
| 107 | void timekeeping_init(void); | 107 | void timekeeping_init(void); |
| 108 | extern int timekeeping_suspended; | ||
| 108 | 109 | ||
| 109 | unsigned long get_seconds(void); | 110 | unsigned long get_seconds(void); |
| 110 | struct timespec current_kernel_time(void); | 111 | struct timespec current_kernel_time(void); |