Skip to contentSkip to conversation

fix compilation error in arch/ppc/kernel/time.c

PATCH New Benoit Boissinot 1 participant 1 message Apr 11, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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).

arch/ppc/kernel/time.c renamed from arch/ppc/kernel/time.c.orig +0 -2
@@ -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);