[patch 041/198] ppc32: fix compilation error in arch/ppc/kernel/time.c

[akpm@osdl.org]

From: Benoit Boissinot <benoit.boissinot@ens-lyon.org>

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

 25-akpm/arch/ppc/kernel/time.c |    2 --
 1 files changed, 2 deletions(-)

diff -puN arch/ppc/kernel/time.c~ppc32-fix-compilation-error-in-arch-ppc-kernel-timec arch/ppc/kernel/time.c
--- 25/arch/ppc/kernel/time.c~ppc32-fix-compilation-error-in-arch-ppc-kernel-timec	2005-04-12 03:21:13.140139296 -0700
+++ 25-akpm/arch/ppc/kernel/time.c	2005-04-12 03:21:13.143138840 -0700
@@ -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);
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/