projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
[powerpc.git]
/
include
/
asm-mips
/
mach-rm
/
mc146818rtc.h
diff --git
a/include/asm-mips/mach-rm/mc146818rtc.h
b/include/asm-mips/mach-rm/mc146818rtc.h
index
d37ae68
..
145bce0
100644
(file)
--- a/
include/asm-mips/mach-rm/mc146818rtc.h
+++ b/
include/asm-mips/mach-rm/mc146818rtc.h
@@
-7,11
+7,15
@@
*
* RTC routines for PC style attached Dallas chip with ARC epoch.
*/
*
* RTC routines for PC style attached Dallas chip with ARC epoch.
*/
-#ifndef __ASM_MACH_RM
200
_MC146818RTC_H
-#define __ASM_MACH_RM
200
_MC146818RTC_H
+#ifndef __ASM_MACH_RM_MC146818RTC_H
+#define __ASM_MACH_RM_MC146818RTC_H
+#ifdef CONFIG_CPU_BIG_ENDIAN
+#define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1900)
+#else
#define mc146818_decode_year(year) ((year) + 1980)
#define mc146818_decode_year(year) ((year) + 1980)
+#endif
#include_next <mc146818rtc.h>
#include_next <mc146818rtc.h>
-#endif /* __ASM_MACH_RM
200
_MC146818RTC_H */
+#endif /* __ASM_MACH_RM_MC146818RTC_H */