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 */ };