2008-01-15 22:21:18

by Frank Rowand

[permalink] [raw]
Subject: [PATCH 2/4] RT: remove conflicting rtc_lock declaration

From: Frank Rowand <[email protected]>

Declaration of rtc_lock in arch/mips/kernel/time.c conflicts with time.h,
remove from include/asm-mips/time.h.

Signed-off-by: Frank Rowand <[email protected]>
---
include/asm-mips/time.h | 2 0 + 2 - 0 !
1 files changed, 2 deletions(-)

Index: linux-2.6.24-rc7/include/asm-mips/time.h
===================================================================
--- linux-2.6.24-rc7.orig/include/asm-mips/time.h
+++ linux-2.6.24-rc7/include/asm-mips/time.h
@@ -19,8 +19,6 @@
#include <linux/clockchips.h>
#include <linux/clocksource.h>

-extern raw_spinlock_t rtc_lock;
-
/*
* RTC ops. By default, they point to weak no-op RTC functions.
* rtc_mips_set_time - reverse the above translation and set time to RTC.