From d771c23519a69b2ec142e10e4eb8e199df0ce130 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Wed, 17 Jan 2007 22:11:27 +0100 Subject: [PATCH] --- yaml --- r: 48898 b: refs/heads/master c: 9dd34948aaf631610355891a70cc55408eae840e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/time.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index aa09cf2b13da..989d4023ecad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c587e4a6a4d808fd2a1c4e7fb2d5a3a31e300d23 +refs/heads/master: 9dd34948aaf631610355891a70cc55408eae840e diff --git a/trunk/arch/arm/kernel/time.c b/trunk/arch/arm/kernel/time.c index 3c8cdcfe8d4a..3825acd6687d 100644 --- a/trunk/arch/arm/kernel/time.c +++ b/trunk/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)