[2.6 ppc patch] fix compilation error in arch/ppc/kernel/time.c

[Benoit Boissinot]

make defconfig give the following error on ppc (gcc-4):

arch/ppc/kernel/time.c:92: error: static declaration of âtime_offsetâ
follows non-static declaration
include/linux/timex.h:236: error: previous declaration of âtime_offsetâ
was here

The following patch solves it (time_offset is declared in timer.c).

Signed-Off-By: Benoit Boissinot <benoit.boissinot@xxxxxxxxxxxx>


--- ./arch/ppc/kernel/time.c.orig	2005-04-11 14:44:19.000000000 +0200
+++ ./arch/ppc/kernel/time.c	2005-04-11 14:44:30.000000000 +0200
@@ -89,8 +89,6 @@ unsigned long tb_to_ns_scale;
 
 extern unsigned long wall_jiffies;
 
-static long time_offset;
-
 DEFINE_SPINLOCK(rtc_lock);
 
 EXPORT_SYMBOL(rtc_lock);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/