From 51e6606491a0f5deaba52fb00c0374b9cb612f98 Mon Sep 17 00:00:00 2001 From: Benoit Boissinot Date: Sat, 16 Apr 2005 15:24:28 -0700 Subject: [PATCH] [PATCH] ppc32: fix compilation error in arch/ppc/kernel/time.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/ppc/kernel/time.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c index b3cee6b0145..73586655919 100644 --- a/arch/ppc/kernel/time.c +++ b/arch/ppc/kernel/time.c @@ -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); -- 2.41.0