[LV-kern-commit] CVS: kernel-2.4/include/asm-mips64/sgi io.h,1.1.1.1,1.2 sgi.h,1.1.1.1,1.2 sgihpc.h,1.1.1.1,1.2 sgimc.h,1.1.1.1,1.2 sgint23.h,1.1.1.1,1.2

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/include/asm-mips64/sgi
In directory usw-pr-cvs1:/tmp/cvs-serv9454/asm-mips64/sgi

Modified Files:
	io.h sgi.h sgihpc.h sgimc.h sgint23.h 
Log Message:
Synch to 2.4.15 commit 1


Index: io.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips64/sgi/io.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- io.h	14 Jan 2001 17:05:01 -0000	1.1.1.1
+++ io.h	9 Apr 2002 12:33:16 -0000	1.2
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.

Index: sgi.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips64/sgi/sgi.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- sgi.h	14 Jan 2001 17:05:01 -0000	1.1.1.1
+++ sgi.h	9 Apr 2002 12:33:16 -0000	1.2
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.

Index: sgihpc.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips64/sgi/sgihpc.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- sgihpc.h	14 Jan 2001 17:05:04 -0000	1.1.1.1
+++ sgihpc.h	9 Apr 2002 12:33:16 -0000	1.2
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
@@ -333,8 +332,6 @@
 
 /* We need software copies of these because they are write only. */
 extern unsigned int sgi_hpc_write1, sgi_hpc_write2;
-
-#define SGI_KEYBOARD_IRQ 20
 
 struct hpc_keyb {
 #ifdef __MIPSEB__

Index: sgimc.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips64/sgi/sgimc.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- sgimc.h	14 Jan 2001 17:05:05 -0000	1.1.1.1
+++ sgimc.h	9 Apr 2002 12:33:16 -0000	1.2
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.

Index: sgint23.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips64/sgi/sgint23.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- sgint23.h	14 Jan 2001 17:05:06 -0000	1.1.1.1
+++ sgint23.h	9 Apr 2002 12:33:16 -0000	1.2
@@ -170,7 +170,7 @@
 #endif
 #define INT2_TCLEAR_T0CLR      0x1        /* Clear timer0 IRQ */
 #define INT2_TCLEAR_T1CLR      0x2        /* Clear timer1 IRQ */
-/* I am guesing there are only two unused registers here 
+/* I am guessing there are only two unused registers here 
  * but I could be wrong...			- andrewb
  */
 /*	u32 _unused[3]; */
@@ -199,7 +199,6 @@
 extern struct sgi_ioc_timers *ioc_timers;
 extern volatile unsigned char *ioc_tclear;
 
-extern void sgint_init(void);
 extern void indy_timer_init(void);
 
 #endif /* _ASM_SGI_SGINT23_H */