diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 21:56:34 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 21:56:34 +0300 |
commit | 7652aab77fbf6de8bcc69ee6a864270b0da6b3f6 (patch) | |
tree | cc380ac53a720a905232463cd8fed9cb27875723 /include/asm-mips/mach-ip32/mc146818rtc.h | |
parent | cd02e27b1514a27b2a8ab59755ae6d23d4d8a10f (diff) | |
parent | aec8b7557cf0fc4dac059112328b5aa89271c77e (diff) | |
download | linux-7652aab77fbf6de8bcc69ee6a864270b0da6b3f6.tar.xz |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'include/asm-mips/mach-ip32/mc146818rtc.h')
-rw-r--r-- | include/asm-mips/mach-ip32/mc146818rtc.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-mips/mach-ip32/mc146818rtc.h b/include/asm-mips/mach-ip32/mc146818rtc.h index f5d780ff843f..c28ba8d84076 100644 --- a/include/asm-mips/mach-ip32/mc146818rtc.h +++ b/include/asm-mips/mach-ip32/mc146818rtc.h @@ -11,7 +11,6 @@ #ifndef __ASM_MACH_IP32_MC146818RTC_H #define __ASM_MACH_IP32_MC146818RTC_H -#include <asm/io.h> #include <asm/ip32/mace.h> #define RTC_PORT(x) (0x70 + (x)) @@ -26,8 +25,10 @@ static inline void CMOS_WRITE(unsigned char data, unsigned long addr) mace->isa.rtc[addr << 8] = data; } -/* FIXME: Do it right. For now just assume that noone lives in 20th century - * and no O2 user in 22th century ;-) */ +/* + * FIXME: Do it right. For now just assume that noone lives in 20th century + * and no O2 user in 22th century ;-) + */ #define mc146818_decode_year(year) ((year) + 2000) #define RTC_ALWAYS_BCD 0 |