From: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Date: Sat, 16 Apr 2005 22:24:28 +0000 (-0700)
Subject: [PATCH] ppc32: fix compilation error in arch/ppc/kernel/time.c
X-Git-Tag: v2.6.12-rc3~204
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=51e6606491a0f5deaba52fb00c0374b9cb612f98;p=~emulex%2Finfiniband.git

[PATCH] ppc32: fix compilation error in arch/ppc/kernel/time.c

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@ens-lyon.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

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);