From: Andrew Morton <akpm@osdl.org>
Date: Sat, 10 Sep 2005 07:27:23 +0000 (-0700)
Subject: [PATCH] time.h: remove ifdefs
X-Git-Tag: v2.6.14-rc1~155
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=373016e9e1353f2af871993d27d00768f08cc883;p=linux-2.6-omap-h63xx.git

[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 36fb2ef13cf..8e83f4e778b 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) 
 {