summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2007-01-17 22:11:27 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-02-16 19:17:44 +0000
commit9dd34948aaf631610355891a70cc55408eae840e (patch)
tree89f13c7aab97b5c92690f8407f0c03c3ebd0049d
parentc587e4a6a4d808fd2a1c4e7fb2d5a3a31e300d23 (diff)
downloadlinux-9dd34948aaf631610355891a70cc55408eae840e.tar.gz
linux-9dd34948aaf631610355891a70cc55408eae840e.tar.bz2
linux-9dd34948aaf631610355891a70cc55408eae840e.zip
[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>
-rw-r--r--arch/arm/kernel/time.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index 3c8cdcfe8d4a..3825acd6687d 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)