diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /include/linux/time.h | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'include/linux/time.h')
| -rw-r--r-- | include/linux/time.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index fbbd2a1c92ba..242f62499bb7 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
| @@ -12,14 +12,14 @@ | |||
| 12 | #ifndef _STRUCT_TIMESPEC | 12 | #ifndef _STRUCT_TIMESPEC |
| 13 | #define _STRUCT_TIMESPEC | 13 | #define _STRUCT_TIMESPEC |
| 14 | struct timespec { | 14 | struct timespec { |
| 15 | time_t tv_sec; /* seconds */ | 15 | __kernel_time_t tv_sec; /* seconds */ |
| 16 | long tv_nsec; /* nanoseconds */ | 16 | long tv_nsec; /* nanoseconds */ |
| 17 | }; | 17 | }; |
| 18 | #endif | 18 | #endif |
| 19 | 19 | ||
| 20 | struct timeval { | 20 | struct timeval { |
| 21 | time_t tv_sec; /* seconds */ | 21 | __kernel_time_t tv_sec; /* seconds */ |
| 22 | suseconds_t tv_usec; /* microseconds */ | 22 | __kernel_suseconds_t tv_usec; /* microseconds */ |
| 23 | }; | 23 | }; |
| 24 | 24 | ||
| 25 | struct timezone { | 25 | struct timezone { |