tree 38488f712b29132cfc54fa6b4c3ee9821fff629b parent 9ce3a719bc5772bc84ab6f50ef505da6992778ff author Benoit Boissinot <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:28 -0700 committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:28 -0700
[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]> ppc/kernel/time.c | 2 -- 1 files changed, 2 deletions(-) Index: arch/ppc/kernel/time.c =================================================================== --- 0ef18ef670bb885a4de66e69f072bd3f6c1be13a/arch/ppc/kernel/time.c (mode:100644 sha1:b3cee6b014546192fd2f7f476d1fb3619493913b) +++ 38488f712b29132cfc54fa6b4c3ee9821fff629b/arch/ppc/kernel/time.c (mode:100644 sha1:735866559199cb39a2a19c59dd38295e4715c082) @@ -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
