From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/11] ARM: export rtc_lock for nvram driver
Date: Sat, 1 Oct 2011 21:21:50 +0200 [thread overview]
Message-ID: <1317496920-7764-2-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1317496920-7764-1-git-send-email-arnd@arndb.de>
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>
---
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 cb634c3..5a54b95 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 */
--
1.7.5.4
next prev parent reply other threads:[~2011-10-01 19:21 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-01 19:21 [PATCH 00/11] Generic ARM fixes for randconfig Arnd Bergmann
2011-10-01 19:21 ` Arnd Bergmann [this message]
2011-10-02 15:21 ` [PATCH 01/11] ARM: export rtc_lock for nvram driver Russell King - ARM Linux
2011-10-01 19:21 ` [PATCH 02/11] ARM: SMP depends on MMU Arnd Bergmann
2011-10-01 19:21 ` [PATCH 03/11] ARM: always use ARM_UNWIND for thumb2 kernels Arnd Bergmann
2011-10-01 19:21 ` [PATCH 04/11] ARM: allow building alignment.c without PROC_FS Arnd Bergmann
2011-10-01 19:21 ` [PATCH 05/11] ARM: vfp: use -mfloat-abi=soft to build vfp Arnd Bergmann
2011-10-03 14:04 ` Dave Martin
2011-10-05 2:04 ` Khem Raj
2011-10-01 19:21 ` [PATCH 06/11] ARM: pm: let platforms select cpu_suspend support Arnd Bergmann
2011-10-01 19:21 ` [PATCH 07/11] ARM: limit CONFIG_HAVE_IDE to platforms that do Arnd Bergmann
2011-10-01 19:21 ` [PATCH 08/11] ARM: add io{read,write}{16,32}be functions Arnd Bergmann
2011-10-01 19:21 ` [PATCH 09/11] ARM: pci: always export pcibios_bus_to_resource Arnd Bergmann
2011-10-01 19:21 ` [PATCH 10/11] ARM: OC_ETM should not select ARM_AMBA Arnd Bergmann
2011-10-01 19:22 ` [PATCH 11/11] ARM: common/vic: use proper __iomem annotations Arnd Bergmann
2011-10-05 1:24 ` H Hartley Sweeten
2011-10-02 13:46 ` [PATCH 12/11] ARM: include linux/highmem.h in uaccess functions Arnd Bergmann
2011-10-02 15:36 ` [PATCH 00/11] Generic ARM fixes for randconfig Russell King - ARM Linux
2011-10-02 15:42 ` Arnd Bergmann
2011-10-02 15:47 ` Russell King - ARM Linux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1317496920-7764-2-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).