From: David Brownell <david-b@pacbell.net>
Date: Wed, 17 Jan 2007 21:11:27 +0000 (+0100)
Subject: [ARM] 4098/1: ARM: rtc_lock only used with rtc_cmos
X-Git-Tag: v2.6.21-rc1~75^2~9
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9dd34948aaf631610355891a70cc55408eae840e;p=linux-2.6-omap-h63xx.git

[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 <dbrownell@users.sourceforge.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index 3c8cdcfe8d4..3825acd6687 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)