]> err.no Git - linux-2.6/commitdiff
[ARM] 4098/1: ARM: rtc_lock only used with rtc_cmos
authorDavid Brownell <david-b@pacbell.net>
Wed, 17 Jan 2007 21:11:27 +0000 (22:11 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 16 Feb 2007 19:17:44 +0000 (19:17 +0000)
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>
arch/arm/kernel/time.c

index 3c8cdcfe8d4a9f72c9ffb3762a72b260be85d73c..3825acd6687d5548cd9195d91a4d8479edf20fa3 100644 (file)
  */
 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)