2 files changed, 3 insertions, 2 deletions

diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c
index ba795a4db1e9..9f996ec881ce 100644
--- a/drivers/rtc/rtc-lib.c
+++ b/drivers/rtc/rtc-lib.c
@@ -51,7 +51,7 @@ EXPORT_SYMBOL(rtc_year_days);
  */
 void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)
 {
-        register int days, month, year;
+        unsigned int days, month, year;
 
         days = time / 86400;
         time -= days * 86400;
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index 316bfaa80872..a3e0880b38fb 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -15,6 +15,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/i2c.h>
@@ -803,6 +804,7 @@ static int m41t80_probe(struct i2c_client *client,
 
 #ifdef CONFIG_RTC_DRV_M41T80_WDT
         if (clientdata->features & M41T80_FEATURE_HT) {
+                save_client = client;
                 rc = misc_register(&wdt_dev);
                 if (rc)
                         goto exit;
@@ -811,7 +813,6 @@ static int m41t80_probe(struct i2c_client *client,
                         misc_deregister(&wdt_dev);
                         goto exit;
                 }
-                save_client = client;
         }
 #endif
         return 0;