[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>

diff --git a/include/linux/time.h b/include/linux/time.h
index 36fb2ef13cff5473814aedbbffabaddc3bf5b41f..8e83f4e778bb11657f2363cf82eb491562615439 100644 (file)
--- 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) 
 {