From 9df98c566deccf1afad918397a27cff6be1f165a Mon Sep 17 00:00:00 2001
From: Mark Zhan <rongkai.zhan@windriver.com>
Date: Tue, 31 Jul 2007 00:39:47 -0700
Subject: [PATCH] --- yaml --- r: 63380 b: refs/heads/master c:
 0439208a8a399f0c4307c561d97e3f5523f5d085 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cd3a4e577f64..8ea7d485c001 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb35fb20b591833fe4205def1338e0e808be3216
+refs/heads/master: 0439208a8a399f0c4307c561d97e3f5523f5d085
diff --git a/trunk/drivers/rtc/rtc-m48t59.c b/trunk/drivers/rtc/rtc-m48t59.c
index 33b752350ab5..bf60d35f580b 100644
--- a/trunk/drivers/rtc/rtc-m48t59.c
+++ b/trunk/drivers/rtc/rtc-m48t59.c
@@ -35,7 +35,7 @@
 struct m48t59_private {
 	void __iomem *ioaddr;
 	unsigned int size; /* iomem size */
-	unsigned int irq;
+	int irq;
 	struct rtc_device *rtc;
 	spinlock_t lock; /* serialize the NVRAM and RTC access */
 };