git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
include
/
asm-generic
/
rtc.h
diff --git
a/include/asm-generic/rtc.h
b/include/asm-generic/rtc.h
index
1a1ea02
..
cef08db
100644
(file)
--- a/
include/asm-generic/rtc.h
+++ b/
include/asm-generic/rtc.h
@@
-46,7
+46,7
@@
static inline unsigned int get_rtc_time(struct rtc_time *time)
{
unsigned long uip_watchdog = jiffies;
unsigned char ctrl;
{
unsigned long uip_watchdog = jiffies;
unsigned char ctrl;
-#ifdef CONFIG_DECSTATION
+#ifdef CONFIG_
MACH_
DECSTATION
unsigned int real_year;
#endif
unsigned int real_year;
#endif
@@
-79,7
+79,7
@@
static inline unsigned int get_rtc_time(struct rtc_time *time)
time->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
time->tm_mon = CMOS_READ(RTC_MONTH);
time->tm_year = CMOS_READ(RTC_YEAR);
time->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
time->tm_mon = CMOS_READ(RTC_MONTH);
time->tm_year = CMOS_READ(RTC_YEAR);
-#ifdef CONFIG_DECSTATION
+#ifdef CONFIG_
MACH_
DECSTATION
real_year = CMOS_READ(RTC_DEC_YEAR);
#endif
ctrl = CMOS_READ(RTC_CONTROL);
real_year = CMOS_READ(RTC_DEC_YEAR);
#endif
ctrl = CMOS_READ(RTC_CONTROL);
@@
-95,7
+95,7
@@
static inline unsigned int get_rtc_time(struct rtc_time *time)
BCD_TO_BIN(time->tm_year);
}
BCD_TO_BIN(time->tm_year);
}
-#ifdef CONFIG_DECSTATION
+#ifdef CONFIG_
MACH_
DECSTATION
time->tm_year += real_year - 72;
#endif
time->tm_year += real_year - 72;
#endif
@@
-117,7
+117,7
@@
static inline int set_rtc_time(struct rtc_time *time)
unsigned char mon, day, hrs, min, sec;
unsigned char save_control, save_freq_select;
unsigned int yrs;
unsigned char mon, day, hrs, min, sec;
unsigned char save_control, save_freq_select;
unsigned int yrs;
-#ifdef CONFIG_DECSTATION
+#ifdef CONFIG_
MACH_
DECSTATION
unsigned int real_yrs, leap_yr;
#endif
unsigned int real_yrs, leap_yr;
#endif
@@
-132,7
+132,7
@@
static inline int set_rtc_time(struct rtc_time *time)
return -EINVAL;
spin_lock_irq(&rtc_lock);
return -EINVAL;
spin_lock_irq(&rtc_lock);
-#ifdef CONFIG_DECSTATION
+#ifdef CONFIG_
MACH_
DECSTATION
real_yrs = yrs;
leap_yr = ((!((yrs + 1900) % 4) && ((yrs + 1900) % 100)) ||
!((yrs + 1900) % 400));
real_yrs = yrs;
leap_yr = ((!((yrs + 1900) % 4) && ((yrs + 1900) % 100)) ||
!((yrs + 1900) % 400));
@@
-174,7
+174,7
@@
static inline int set_rtc_time(struct rtc_time *time)
save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
-#ifdef CONFIG_DECSTATION
+#ifdef CONFIG_
MACH_
DECSTATION
CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
#endif
CMOS_WRITE(yrs, RTC_YEAR);
CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
#endif
CMOS_WRITE(yrs, RTC_YEAR);