diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-06-10 13:58:30 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-01 21:08:26 +0200 |
| commit | 63216d3c235d662726d6f5c55ceca91c70bb3eda (patch) | |
| tree | b9db375e61be2c55a1013bf75364a31493ebbc78 /arch/arm/kernel/time.c | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff) | |
| download | blackbird-obmc-linux-63216d3c235d662726d6f5c55ceca91c70bb3eda.tar.gz blackbird-obmc-linux-63216d3c235d662726d6f5c55ceca91c70bb3eda.zip | |
ARM: export rtc_lock for nvram driver
The rtc_lock is used by both the nvram and rtc drivers, so
we need to export it if at least one of the two is built,
not just for the rtc driver.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/kernel/time.c')
| -rw-r--r-- | arch/arm/kernel/time.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index cb634c3e28e9..5a54b95d6bd2 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -39,13 +39,11 @@ */ static struct sys_timer *system_timer; -#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) +#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || \ + defined(CONFIG_NVRAM) || defined(CONFIG_NVRAM_MODULE) /* this needs a better home */ DEFINE_SPINLOCK(rtc_lock); - -#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 */ |
