summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-09-06 00:03:20 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-09-06 00:03:20 +0000
commit9781bc8304de086b933804348a40995d60b66007 (patch)
treea598b003c8d526d11718f75454aa436f84d3a300 /drivers
parent73c5c49c4d59b104dd3fc00a3e23ec73fc1a9e9c (diff)
DECstation RTC fix omissions. Fix from Maciej.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/rtc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index d29c41f64..e98d706a6 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -412,7 +412,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
* for non-leap years, so that Feb, 29th is handled
* correctly.
*/
- if (!leap_yr && mon < 3) {
+ if (!leap_yr && mon < 3) {
real_yrs--;
yrs = 73;
}
@@ -720,7 +720,7 @@ found:
epoch = 1952;
guess = "Digital UNIX";
} else if (year >= 72 && year < 74) {
- epoch = 1928;
+ epoch = 2000;
guess = "Digital DECstation";
}
if (guess)
@@ -988,6 +988,9 @@ static void get_rtc_time(struct rtc_time *rtc_tm)
static void get_rtc_alm_time(struct rtc_time *alm_tm)
{
unsigned char ctrl;
+#ifdef CONFIG_DECSTATION
+ unsigned int real_year;
+#endif
/*
* Only the values that we read from the RTC are set. That