[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>
This commit is contained in:
Benoit Boissinot 2005-04-16 15:24:28 -07:00 committed by Linus Torvalds
parent 9ce3a719bc
commit 51e6606491

View file

@ -89,8 +89,6 @@ unsigned long tb_to_ns_scale;
extern unsigned long wall_jiffies; extern unsigned long wall_jiffies;
static long time_offset;
DEFINE_SPINLOCK(rtc_lock); DEFINE_SPINLOCK(rtc_lock);
EXPORT_SYMBOL(rtc_lock); EXPORT_SYMBOL(rtc_lock);