Merge ../linux-2.6 by hand

[linux-2.6-omap-h63xx.git] / arch / ppc / kernel / time.c

diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c
index 76f44ce4772ec05ea8b3dd4818983204a4b00a56..53ea723af60aa5fff91a1ff057986584098f7285 100644 (file)
--- a/arch/ppc/kernel/time.c
+++ b/arch/ppc/kernel/time.c
@@ -66,11 +66,6 @@
 
 #include <asm/time.h>
 
-/* XXX false sharing with below? */
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-EXPORT_SYMBOL(jiffies_64);
-
 unsigned long disarm_decr[NR_CPUS];
 
 extern struct timezone sys_tz;