]> err.no Git - linux-2.6/commit
[PATCH] ppc32: fix compilation error in arch/ppc/kernel/time.c
authorBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Sat, 16 Apr 2005 22:24:28 +0000 (15:24 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 16 Apr 2005 22:24:28 +0000 (15:24 -0700)
commit51e6606491a0f5deaba52fb00c0374b9cb612f98
tree38488f712b29132cfc54fa6b4c3ee9821fff629b
parent9ce3a719bc5772bc84ab6f50ef505da6992778ff
[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>
arch/ppc/kernel/time.c