From 9f7a0a2b604235cd3d911a9024abd8fc9b85dce7 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Thu, 4 Oct 2012 17:14:00 -0700
Subject: [PATCH] --- yaml --- r: 330111 b: refs/heads/master c:
 7c6a52a090ce7f680077ed42326e11cf17e713dc h: refs/heads/master i:   330109:
 e392f1f0b3192f5eb39e71940c7b24cec6ff096f   330107:
 21b9d6e8c9d50c0bcb5f530277617baa2a36313c   330103:
 955c7a2fe6142e28ab5e463179bcfa430cd234c8   330095:
 5283469022e3c58032fae93384c2e1ed61885868   330079:
 3eb0cda1b697f68396197c4858c74879cd389816   330047:
 5ad8e4ba8fc355503359ba6c70b07c2e38da4bc8   329983:
 8aff929b23aebeed07febb3fbe4a7b02969bf343 v: v3

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

diff --git a/[refs] b/[refs]
index f7ea30947cc8..a4166a9f2045 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b8029fab64164b5895d58d23229b75c82e3a6fc
+refs/heads/master: 7c6a52a090ce7f680077ed42326e11cf17e713dc
diff --git a/trunk/drivers/rtc/rtc-jz4740.c b/trunk/drivers/rtc/rtc-jz4740.c
index 05ab227eeff7..1224182d3eab 100644
--- a/trunk/drivers/rtc/rtc-jz4740.c
+++ b/trunk/drivers/rtc/rtc-jz4740.c
@@ -42,7 +42,7 @@ struct jz4740_rtc {
 
 	struct rtc_device *rtc;
 
-	unsigned int irq;
+	int irq;
 
 	spinlock_t lock;
 };