From 875934c50000811d51339e0eeb930f1eff256041 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 7 Oct 2008 16:13:59 +0200
Subject: [PATCH] --- yaml --- r: 111084 b: refs/heads/master c:
 52948b3f7c481be2cd3a68d1db42dd6906bf853a h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/sound/core/Kconfig | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 22bd03adf23a..b62ac813ba00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb01e2b99264d579085c63966744d91b87c6b35d
+refs/heads/master: 52948b3f7c481be2cd3a68d1db42dd6906bf853a
diff --git a/trunk/sound/core/Kconfig b/trunk/sound/core/Kconfig
index 91f91c5cdb4e..66348c92f88d 100644
--- a/trunk/sound/core/Kconfig
+++ b/trunk/sound/core/Kconfig
@@ -108,6 +108,9 @@ config SND_RTCTIMER
 	  To compile this driver as a module, choose M here: the module
 	  will be called snd-rtctimer.
 
+	  Note that this option is exclusive with the new RTC drivers
+	  (CONFIG_RTC_CLASS) since this requires the old API.
+
 config SND_SEQ_RTCTIMER_DEFAULT
 	bool "Use RTC as default sequencer timer"
 	depends on SND_RTCTIMER && SND_SEQUENCER