diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /include/linux/time.h | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
| download | kernel-crypto-905ec87e93bc9e01b15c60035cd6a50c636cbaef.tar.gz kernel-crypto-905ec87e93bc9e01b15c60035cd6a50c636cbaef.tar.xz kernel-crypto-905ec87e93bc9e01b15c60035cd6a50c636cbaef.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/linux/time.h')
| -rw-r--r-- | include/linux/time.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index c10d4c21c18..8e83f4e778b 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -28,17 +28,10 @@ struct timezone { #ifdef __KERNEL__ /* Parameters used to convert the timespec values */ -#ifndef USEC_PER_SEC +#define MSEC_PER_SEC (1000L) #define USEC_PER_SEC (1000000L) -#endif - -#ifndef NSEC_PER_SEC #define NSEC_PER_SEC (1000000000L) -#endif - -#ifndef NSEC_PER_USEC #define NSEC_PER_USEC (1000L) -#endif static __inline__ int timespec_equal(struct timespec *a, struct timespec *b) { |