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