From 955913ff49623037678aa35d7a64cb12d8c5e275 Mon Sep 17 00:00:00 2001
From: John Stultz <john.stultz@linaro.org>
Date: Mon, 12 Dec 2011 13:57:52 -0800
Subject: [PATCH] --- yaml --- r: 276911 b: refs/heads/master c:
 c3b79770e51ab1fd4201f3b54edf30113b9ce74f h: refs/heads/master i:   276909:
 745721f829db76cdcad6d218c17c81201749e168   276907:
 f6f40c0664773c901702c255ae1b5584cbf95904   276903:
 4b0238d053a3ff05f48bba88b51105189fdbcd44   276895:
 aed12de692deabb7c670b8b31a073e95fa1d00d2 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/rtc/rtc-m41t80.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 86fe31bce941..e2ba3986d03c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93b2ec0128c431148b216b8f7337c1a52131ef03
+refs/heads/master: c3b79770e51ab1fd4201f3b54edf30113b9ce74f
diff --git a/trunk/drivers/rtc/rtc-m41t80.c b/trunk/drivers/rtc/rtc-m41t80.c
index eda128fc1d38..64aedd8cc095 100644
--- a/trunk/drivers/rtc/rtc-m41t80.c
+++ b/trunk/drivers/rtc/rtc-m41t80.c
@@ -357,10 +357,19 @@ static int m41t80_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *t)
 static struct rtc_class_ops m41t80_rtc_ops = {
 	.read_time = m41t80_rtc_read_time,
 	.set_time = m41t80_rtc_set_time,
+	/*
+	 * XXX - m41t80 alarm functionality is reported broken.
+	 * until it is fixed, don't register alarm functions.
+	 *
 	.read_alarm = m41t80_rtc_read_alarm,
 	.set_alarm = m41t80_rtc_set_alarm,
+	*/
 	.proc = m41t80_rtc_proc,
+	/*
+	 * See above comment on broken alarm
+	 *
 	.alarm_irq_enable = m41t80_rtc_alarm_irq_enable,
+	*/
 };
 
 #if defined(CONFIG_RTC_INTF_SYSFS) || defined(CONFIG_RTC_INTF_SYSFS_MODULE)