From deec2d8109ca9d9826bb836a10e7e6860a21f75d Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 9 Jan 2006 20:52:25 -0800
Subject: [PATCH] --- yaml --- r: 17583 b: refs/heads/master c:
 1ad106ca185e66dc312518e18e2ffaedf376a160 h: refs/heads/master i:   17581:
 887f607e82578af6a1d7ae3b8e813e24620634f7   17579:
 bcde8a1e9d31dff072646f9c6bb92fb265d4c46f   17575:
 c0b4ba57f6f472ecc7029b63ec58ed8270526f43   17567:
 fc1e116f2758ec88becb8808604338ba4e626553 v: v3

---
 [refs]                     |  2 +-
 trunk/include/linux/time.h | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index f689a4c38efa..950d482c0274 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c4f6eeca98a805fd0c2536b55039383eb56d2ba
+refs/heads/master: 1ad106ca185e66dc312518e18e2ffaedf376a160
diff --git a/trunk/include/linux/time.h b/trunk/include/linux/time.h
index ea64cde7c450..aded44c48d42 100644
--- a/trunk/include/linux/time.h
+++ b/trunk/include/linux/time.h
@@ -100,30 +100,25 @@ struct	itimerval {
 	struct	timeval it_value;	/* current value */
 };
 
-
 /*
  * The IDs of the various system clocks (for POSIX.1b interval timers).
  */
-#define CLOCK_REALTIME		 0
-#define CLOCK_MONOTONIC	  	 1
-#define CLOCK_PROCESS_CPUTIME_ID 2
-#define CLOCK_THREAD_CPUTIME_ID	 3
+#define CLOCK_REALTIME			0
+#define CLOCK_MONOTONIC			1
+#define CLOCK_PROCESS_CPUTIME_ID	2
+#define CLOCK_THREAD_CPUTIME_ID		3
 
 /*
  * The IDs of various hardware clocks
  */
-
-
-#define CLOCK_SGI_CYCLE 10
-#define MAX_CLOCKS 16
-#define CLOCKS_MASK  (CLOCK_REALTIME | CLOCK_MONOTONIC)
-#define CLOCKS_MONO (CLOCK_MONOTONIC)
+#define CLOCK_SGI_CYCLE			10
+#define MAX_CLOCKS			16
+#define CLOCKS_MASK			(CLOCK_REALTIME | CLOCK_MONOTONIC)
+#define CLOCKS_MONO			CLOCK_MONOTONIC
 
 /*
  * The various flags for setting POSIX.1b interval timers.
  */
-
-#define TIMER_ABSTIME 0x01
-
+#define TIMER_ABSTIME			0x01
 
 #endif