Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[linux-2.6] / include / asm-mips / mach-atlas / mc146818rtc.h

diff --git a/include/asm-mips/mach-atlas/mc146818rtc.h b/include/asm-mips/mach-atlas/mc146818rtc.h
index fc09928571d6637df76d03814ec72b1847edd27a..51d337e1bbd12f0ec1dba6871c6d743230eef2e7 100644 (file)
--- a/include/asm-mips/mach-atlas/mc146818rtc.h
+++ b/include/asm-mips/mach-atlas/mc146818rtc.h
@@ -33,7 +33,7 @@
 #define RTC_PORT(x)    (ATLAS_RTC_ADR_REG + (x) * 8)
 #define RTC_IO_EXTENT  0x100
 #define RTC_IOMAPPED   0
-#define RTC_IRQ                ATLASINT_RTC
+#define RTC_IRQ                ATLAS_INT_RTC
 
 static inline unsigned char CMOS_READ(unsigned long addr)
 {
@@ -55,6 +55,6 @@ static inline void CMOS_WRITE(unsigned char data, unsigned long addr)
 
 #define RTC_ALWAYS_BCD 0
 
-#define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1970)
+#define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1900)
 
 #endif /* __ASM_MACH_ATLAS_MC146818RTC_H */