patch-2.4.19 linux-2.4.19/arch/mips/ddb5xxx/common/rtc_ds1386.c

Next file: linux-2.4.19/arch/mips/ddb5xxx/ddb5476/Makefile
Previous file: linux-2.4.19/arch/mips/ddb5xxx/common/prom.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.18/arch/mips/ddb5xxx/common/rtc_ds1386.c linux-2.4.19/arch/mips/ddb5xxx/common/rtc_ds1386.c
@@ -24,7 +24,7 @@
 #include <asm/time.h>
 #include <asm/addrspace.h>
 
-#include <asm/ddb5xxx/debug.h>
+#include <asm/debug.h>
 
 #define	EPOCH		2000
 
@@ -101,7 +101,7 @@
 	}
 
 	temp = READ_RTC(0x9);
-	month = BIN_TO_BCD(tm.tm_mon);
+	month = BIN_TO_BCD(tm.tm_mon+1);	/* tm_mon starts from 0 to 11 */
 	if (month != (temp & 0x1f)) {
 		WRITE_RTC( 0x9,
 			   (month & 0x1f) | (temp & ~0x1f) );
@@ -147,7 +147,7 @@
 	
 	/* remember the base */
 	rtc_base = base;
-	MIPS_ASSERT((rtc_base & 0xe0000000) == KSEG1);
+	db_assert((rtc_base & 0xe0000000) == KSEG1);
 
 	/* turn on RTC if it is not on */
 	byte = READ_RTC(0x9);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)