From: Andrew Morton <akpm@osdl.org>

kernel/tsacct.c:26:1: warning: "USEC_PER_TICK" redefined
In file included from include/linux/timex.h:187,
                 from include/linux/sched.h:50,
                 from kernel/tsacct.c:20:
include/asm/timex.h:47:1: warning: this is the location of the previous definition

Cc: John Stultz <johnstul@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@muc.de>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/tsacct.c |    2 --
 1 file changed, 2 deletions(-)

diff -puN kernel/tsacct.c~time-x86_64-split-x86_64-kernel-timec-up-fix kernel/tsacct.c
--- a/kernel/tsacct.c~time-x86_64-split-x86_64-kernel-timec-up-fix
+++ a/kernel/tsacct.c
@@ -22,8 +22,6 @@
 #include <linux/acct.h>
 #include <linux/jiffies.h>
 
-
-#define USEC_PER_TICK	(USEC_PER_SEC/HZ)
 /*
  * fill in basic accounting fields
  */
_