From eceb185eb9a9ad0301fa29117c0a6138e8ce2aa7 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Tue, 6 May 2008 20:42:30 -0700
Subject: [PATCH] --- yaml --- r: 96132 b: refs/heads/master c:
 9a0f4aea878315ba87cb8a4d0dddc67832218e3f h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/rtc/rtc-ds1511.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4485e1e6d7af..83f16d3ca4d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8b1ecf3d5c48ebde9fed61c7a682b2270e09d2b
+refs/heads/master: 9a0f4aea878315ba87cb8a4d0dddc67832218e3f
diff --git a/trunk/drivers/rtc/rtc-ds1511.c b/trunk/drivers/rtc/rtc-ds1511.c
index a83a40b3ebaa..0f0d27d1c4ca 100644
--- a/trunk/drivers/rtc/rtc-ds1511.c
+++ b/trunk/drivers/rtc/rtc-ds1511.c
@@ -184,7 +184,7 @@ ds1511_wdog_disable(void)
 static int ds1511_rtc_set_time(struct device *dev, struct rtc_time *rtc_tm)
 {
 	u8 mon, day, dow, hrs, min, sec, yrs, cen;
-	unsigned int flags;
+	unsigned long flags;
 
 	/*
 	 * won't have to change this for a while
@@ -247,7 +247,7 @@ static int ds1511_rtc_set_time(struct device *dev, struct rtc_time *rtc_tm)
 static int ds1511_rtc_read_time(struct device *dev, struct rtc_time *rtc_tm)
 {
 	unsigned int century;
-	unsigned int flags;
+	unsigned long flags;
 
 	spin_lock_irqsave(&ds1511_lock, flags);
 	rtc_disable_update();