summaryrefslogtreecommitdiffstats
path: root/include/linux/time.h
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-09-10 00:27:23 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-10 10:06:36 -0700
commit373016e9e1353f2af871993d27d00768f08cc883 (patch)
tree9f5c47b3f32a6c9d7d9c05dc3285b14b453ce09e /include/linux/time.h
parent84f902c0903a98a315b45a4fba3d2ac0de388256 (diff)
downloadop-kernel-dev-373016e9e1353f2af871993d27d00768f08cc883.zip
op-kernel-dev-373016e9e1353f2af871993d27d00768f08cc883.tar.gz
[PATCH] time.h: remove ifdefs
Remove these ifdefs - there's no need to have more than one definition of these multipliers anywhere. Cc: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/time.h')
-rw-r--r--include/linux/time.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/time.h b/include/linux/time.h
index 36fb2ef..8e83f4e 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -29,18 +29,9 @@ struct timezone {
/* Parameters used to convert the timespec values */
#define MSEC_PER_SEC (1000L)
-
-#ifndef USEC_PER_SEC
#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)
{
OpenPOWER on IntegriCloud