diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /include/linux/time.h | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.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 { |