X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fchar%2Frtc.c;h=641fe5e8a2883548ca0d268bbf6491d0650e311d;hb=f9296eb00ed30209424102d3c920e69617eea853;hp=1b3b25889f447b645a64e832e073b5da07eb408d;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 1b3b25889..641fe5e8a 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -99,6 +99,7 @@ static int rtc_irq = PCI_IRQ_NONE;
 
 #ifdef	CONFIG_HPET_RTC_IRQ
 #undef	RTC_IRQ
+#define	RTC_IRQ	0
 #endif
 
 #ifdef RTC_IRQ
@@ -508,7 +509,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
 		unsigned char mon, day, hrs, min, sec, leap_yr;
 		unsigned char save_control, save_freq_select;
 		unsigned int yrs;
-#ifdef CONFIG_MACH_DECSTATION
+#ifdef CONFIG_DECSTATION
 		unsigned int real_yrs;
 #endif
 
@@ -544,7 +545,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
 			return -EINVAL;
 
 		spin_lock_irq(&rtc_lock);
-#ifdef CONFIG_MACH_DECSTATION
+#ifdef CONFIG_DECSTATION
 		real_yrs = yrs;
 		yrs = 72;
 
@@ -583,7 +584,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
 		save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
 		CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
 
-#ifdef CONFIG_MACH_DECSTATION
+#ifdef CONFIG_DECSTATION
 		CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
 #endif
 		CMOS_WRITE(yrs, RTC_YEAR);
@@ -974,7 +975,7 @@ no_irq:
 		release_region(RTC_PORT(0), RTC_IO_EXTENT);
 		return -ENODEV;
 	}
-	if (!create_proc_read_entry ("driver/rtc", 0, NULL, rtc_read_proc, NULL)) {
+	if (create_proc_read_entry ("driver/rtc", 0, 0, rtc_read_proc, NULL) == NULL) {
 #ifdef RTC_IRQ
 		free_irq(RTC_IRQ, NULL);
 #endif
@@ -1213,7 +1214,7 @@ void rtc_get_rtc_time(struct rtc_time *rtc_tm)
 {
 	unsigned long uip_watchdog = jiffies;
 	unsigned char ctrl;
-#ifdef CONFIG_MACH_DECSTATION
+#ifdef CONFIG_DECSTATION
 	unsigned int real_year;
 #endif
 
@@ -1246,7 +1247,7 @@ void rtc_get_rtc_time(struct rtc_time *rtc_tm)
 	rtc_tm->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
 	rtc_tm->tm_mon = CMOS_READ(RTC_MONTH);
 	rtc_tm->tm_year = CMOS_READ(RTC_YEAR);
-#ifdef CONFIG_MACH_DECSTATION
+#ifdef CONFIG_DECSTATION
 	real_year = CMOS_READ(RTC_DEC_YEAR);
 #endif
 	ctrl = CMOS_READ(RTC_CONTROL);
@@ -1262,7 +1263,7 @@ void rtc_get_rtc_time(struct rtc_time *rtc_tm)
 		BCD_TO_BIN(rtc_tm->tm_year);
 	}
 
-#ifdef CONFIG_MACH_DECSTATION
+#ifdef CONFIG_DECSTATION
 	rtc_tm->tm_year += real_year - 72;
 #endif