Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

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

diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index f98a83a11aaeb66411a9083f78f887807528e732..bb53c09bad169beb8427755a3de4e0aaf665dbf7 100644 (file)
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -61,7 +61,7 @@
 struct rtc_plat_data {
        struct rtc_device *rtc;
        void __iomem *ioaddr;
-       unsigned long baseaddr;
+       resource_size_t baseaddr;
        unsigned long last_jiffies;
        int irq;
        unsigned int irqen;
@@ -395,7 +395,7 @@ static struct platform_driver ds1553_rtc_driver = {
        .probe          = ds1553_rtc_probe,
        .remove         = __devexit_p(ds1553_rtc_remove),
        .driver         = {
-               .name   = "ds1553",
+               .name   = "rtc-ds1553",
                .owner  = THIS_MODULE,
        },
 };
@@ -407,7 +407,7 @@ static __init int ds1553_init(void)
 
 static __exit void ds1553_exit(void)
 {
-       return platform_driver_unregister(&ds1553_rtc_driver);
+       platform_driver_unregister(&ds1553_rtc_driver);
 }
 
 module_init(ds1553_init);