Commit 51e66064 authored by Benoit Boissinot's avatar Benoit Boissinot Committed by Linus Torvalds
Browse files

[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: default avatarBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9ce3a719

arch/ppc/kernel/time.c

+0 −2
Original line number Diff line number Diff line
@@ -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);