tree 1a6c2a7d9c369c7ce6c93c1b04247f0477feb36d
parent 84cc534bfd6f7ddb252fb1a31d3dc7b773721fcf
author Benoit Boissinot <[EMAIL PROTECTED]> Tue Apr 12 08:25:01 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:25:01 2005

[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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

 time.c |    2 --
 1 files changed, 2 deletions(-)

Index: arch/ppc/kernel/time.c
===================================================================
--- b80166d845c306e5155cdb9950af3737ff4931ef/arch/ppc/kernel/time.c  
(mode:100644 sha1:6a3fc3692f2e1b96ee6d83cf2be4143085c23cb5)
+++ 1a6c2a7d9c369c7ce6c93c1b04247f0477feb36d/arch/ppc/kernel/time.c  
(mode:100644 sha1:0d91251578f1535aab1947112e08fa0aa77229a6)
@@ -89,8 +89,6 @@
 
 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 bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to