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