From: Paul M. <le...@us...> - 2001-08-25 02:19:32
|
Update of /cvsroot/linux-mips/linux/arch/mips/sgi/kernel In directory usw-pr-cvs1:/tmp/cvs-serv13548/arch/mips/sgi/kernel Modified Files: indy_int.c setup.c Log Message: Sync to 2.4.7 Index: indy_int.c =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/sgi/kernel/indy_int.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** indy_int.c 2001/06/22 02:29:31 1.1.1.1 --- indy_int.c 2001/08/25 02:19:27 1.2 *************** *** 70,75 **** extern asmlinkage void indyIRQ(void); - unsigned long spurious_count = 0; - /* Local IRQ's are layed out logically like this: * --- 70,73 ---- Index: setup.c =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/sgi/kernel/setup.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** setup.c 2001/06/22 02:29:31 1.1.1.1 --- setup.c 2001/08/25 02:19:27 1.2 *************** *** 25,28 **** --- 25,29 ---- #include <asm/sgi/sgihpc.h> #include <asm/sgi/sgint23.h> + #include <asm/time.h> #include <asm/gdb-stub.h> *************** *** 117,122 **** sgi_read_status }; - - void (*board_time_init)(struct irqaction *irq); static unsigned long dosample(volatile unsigned char *tcwp, --- 118,121 ---- |