From 5d34f404150e7850bc2e21f77f6a9764d9a0d575 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Wed, 3 Dec 2008 04:16:04 +0000
Subject: [PATCH] --- yaml --- r: 128001 b: refs/heads/master c:
 022b7690454ebf945d46467fea7b5f47bbb9b420 h: refs/heads/master i:   127999:
 c3235cfcfeead2886fbe3590299afabe7ec72392 v: v3

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

diff --git a/[refs] b/[refs]
index 964da32c3db0..2f54ebeacb86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2e6675fffe435989e51c084600581ca58048c13
+refs/heads/master: 022b7690454ebf945d46467fea7b5f47bbb9b420
diff --git a/trunk/drivers/rtc/rtc-parisc.c b/trunk/drivers/rtc/rtc-parisc.c
index 346d633655e7..c6bfa6fe1a2a 100644
--- a/trunk/drivers/rtc/rtc-parisc.c
+++ b/trunk/drivers/rtc/rtc-parisc.c
@@ -34,7 +34,8 @@ static int parisc_get_time(struct device *dev, struct rtc_time *tm)
 static int parisc_set_time(struct device *dev, struct rtc_time *tm)
 {
 	struct parisc_rtc *p = dev_get_drvdata(dev);
-	unsigned long flags, ret;
+	unsigned long flags;
+	int ret;
 
 	spin_lock_irqsave(&p->lock, flags);
 	ret = set_rtc_time(tm);