diff options
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> | 2005-04-16 15:24:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:24:28 -0700 |
| commit | 51e6606491a0f5deaba52fb00c0374b9cb612f98 (patch) | |
| tree | 38488f712b29132cfc54fa6b4c3ee9821fff629b /arch | |
| parent | 9ce3a719bc5772bc84ab6f50ef505da6992778ff (diff) | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc/kernel/time.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c index b3cee6b01454..735866559199 100644 --- a/arch/ppc/kernel/time.c +++ b/arch/ppc/kernel/time.c @@ -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); |