diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /kernel/time.c | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'kernel/time.c')
| -rw-r--r-- | kernel/time.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time.c b/kernel/time.c index dd5ae1162a8f..40c2410ac99a 100644 --- a/kernel/time.c +++ b/kernel/time.c | |||
| @@ -570,6 +570,7 @@ void getnstimeofday(struct timespec *tv) | |||
| 570 | tv->tv_sec = x.tv_sec; | 570 | tv->tv_sec = x.tv_sec; |
| 571 | tv->tv_nsec = x.tv_usec * NSEC_PER_USEC; | 571 | tv->tv_nsec = x.tv_usec * NSEC_PER_USEC; |
| 572 | } | 572 | } |
| 573 | EXPORT_SYMBOL_GPL(getnstimeofday); | ||
| 573 | #endif | 574 | #endif |
| 574 | 575 | ||
| 575 | #if (BITS_PER_LONG < 64) | 576 | #if (BITS_PER_LONG < 64) |