From f353f1bb7f36a53e6da81f3f34b3a64c9fb69a92 Mon Sep 17 00:00:00 2001
From: Andrew Victor <andrew@sanpeople.com>
Date: Fri, 30 Jun 2006 01:56:01 -0700
Subject: [PATCH] --- yaml --- r: 31403 b: refs/heads/master c:
 304228e29ae212952726e91511eddc0ba551bd31 h: refs/heads/master i:   31401:
 7c74f4e4cabdb5d183cdb3fd7550b99e473c4085   31399:
 73897262b589be7f8fba3f1b50ec45fa35bd971e v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/rtc.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e9bf83182633..b8e3ad3a9e62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7b384043e27bed4f23b108481b99c518dd01a01
+refs/heads/master: 304228e29ae212952726e91511eddc0ba551bd31
diff --git a/trunk/include/linux/rtc.h b/trunk/include/linux/rtc.h
index 36e2bf4b4315..5371e4e74595 100644
--- a/trunk/include/linux/rtc.h
+++ b/trunk/include/linux/rtc.h
@@ -34,8 +34,8 @@ struct rtc_time {
  * alarm API.
  */
 struct rtc_wkalrm {
-	unsigned char enabled;	/* 0 = alarm disable, 1 = alarm disabled */
-	unsigned char pending;  /* 0 = alarm pending, 1 = alarm not pending */
+	unsigned char enabled;	/* 0 = alarm disabled, 1 = alarm enabled */
+	unsigned char pending;  /* 0 = alarm not pending, 1 = alarm pending */
 	struct rtc_time time;	/* time the alarm is set to */
 };