diff options
| author | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 14:47:29 -0400 |
|---|---|---|
| committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 14:47:29 -0400 |
| commit | 2d61aecee8f32259920cdf90a452fa26ffc64e9f (patch) | |
| tree | 2311b6b4c12b946164e8cfb3422cebdfecf08f37 /include/linux/time.h | |
| parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff) | |
| parent | 6bb27d7349db51b50c40534710fe164ca0d58902 (diff) | |
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
Diffstat (limited to 'include/linux/time.h')
| -rw-r--r-- | include/linux/time.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index 4d358e9d10f1..05e32a72103c 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
| @@ -142,9 +142,7 @@ void timekeeping_inject_sleeptime(struct timespec *delta); | |||
| 142 | * finer then tick granular time. | 142 | * finer then tick granular time. |
| 143 | */ | 143 | */ |
| 144 | #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET | 144 | #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET |
| 145 | extern u32 arch_gettimeoffset(void); | 145 | extern u32 (*arch_gettimeoffset)(void); |
| 146 | #else | ||
| 147 | static inline u32 arch_gettimeoffset(void) { return 0; } | ||
| 148 | #endif | 146 | #endif |
| 149 | 147 | ||
| 150 | extern void do_gettimeofday(struct timeval *tv); | 148 | extern void do_gettimeofday(struct timeval *tv); |