[Linux-mips-commits]CVS: linux/arch/mips/ddb5xxx/common irq.c,1.3,1.4 nile4.c,1.1.1.1,1.2 rtc_ds1386.c,1.3,1.4

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/ddb5xxx/common
In directory usw-pr-cvs1:/tmp/cvs-serv14020/arch/mips/ddb5xxx/common

Modified Files:
	irq.c nile4.c rtc_ds1386.c 
Log Message:
Update debug crapola.

Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ddb5xxx/common/irq.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- irq.c	2001/09/07 18:43:40	1.3
+++ irq.c	2001/10/11 20:45:25	1.4
@@ -16,6 +16,8 @@
 
 void (*irq_setup)(void);
 
+extern void init_generic_irq(void);
+
 void __init init_IRQ(void)
 {
 #ifdef CONFIG_REMOTE_DEBUG
@@ -26,6 +28,8 @@
 	set_debug_traps();
 	breakpoint();
 #endif
+	/* set up default irq controller */
+	init_generic_irq();
 
 	/* invoke board-specific irq setup */
 	irq_setup();

Index: nile4.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ddb5xxx/common/nile4.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- nile4.c	2001/06/22 02:29:31	1.1.1.1
+++ nile4.c	2001/10/11 20:45:25	1.2
@@ -21,7 +21,6 @@
 #include <linux/kernel.h>
 
 #include <asm/ddb5xxx/ddb5xxx.h>
-#include <asm/ddb5xxx/debug.h>
 
 u32
 ddb_calc_pdar(u32 phys, u32 size, int width, 

Index: rtc_ds1386.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ddb5xxx/common/rtc_ds1386.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rtc_ds1386.c	2001/08/25 06:24:45	1.3
+++ rtc_ds1386.c	2001/10/11 20:45:25	1.4
@@ -24,7 +24,7 @@
 #include <asm/time.h>
 #include <asm/addrspace.h>
 
-#include <asm/ddb5xxx/debug.h>
+#include <asm/debug.h>
 
 #define	EPOCH		2000
 
@@ -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);