Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / drivers / rtc / rtc-m48t59.c

diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
index 33b752350ab5c91b708eda96cbff4df7b5d53f2c..bf60d35f580b55e98495af3e6c7ab8157135be78 100644 (file)
--- a/drivers/rtc/rtc-m48t59.c
+++ b/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 */
 };