Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9dd34948aaf631610355891a70cc55408eae840e
Commit:     9dd34948aaf631610355891a70cc55408eae840e
Parent:     c587e4a6a4d808fd2a1c4e7fb2d5a3a31e300d23
Author:     David Brownell <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 17 22:11:27 2007 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Fri Feb 16 19:17:44 2007 +0000

    [ARM] 4098/1: ARM: rtc_lock only used with rtc_cmos
    
    Fix build glitches on ARM ... the only user of "rtc_lock" today is the
    optional PC-style "CMOS" RTC driver, the legacy SA1100 RTC driver is
    not even in the tree any more.
    
    Signed-off-by: David Brownell <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/kernel/time.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index 3c8cdcf..3825acd 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -40,12 +40,14 @@
  */
 struct sys_timer *system_timer;
 
+#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE)
 /* this needs a better home */
 DEFINE_SPINLOCK(rtc_lock);
 
-#ifdef CONFIG_SA1100_RTC_MODULE
+#ifdef CONFIG_RTC_DRV_CMOS_MODULE
 EXPORT_SYMBOL(rtc_lock);
 #endif
+#endif /* pc-style 'CMOS' RTC support */
 
 /* change this if you have some constant time drift */
 #define USECS_PER_JIFFY        (1000000/HZ)
-
To unsubscribe from this list: send the line "unsubscribe git-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