[LV-kern-commit] CVS: kernel-2.4/include/asm-mips/sgi 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-mips/sgi
In directory usw-pr-cvs1:/tmp/cvs-serv9454/asm-mips/sgi

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


Index: sgi.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips/sgi/sgi.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: sgihpc.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips/sgi/sgihpc.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: sgimc.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips/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 16:50:50 -0000	1.1.1.1
+++ sgimc.h	9 Apr 2002 12:33:15 -0000	1.2
@@ -200,7 +200,7 @@
 	u32 _unused7;
 	volatile u32 dmamode;     /* DMA mode config bit settings */
 	u32 _unused8;
-	volatile u32 dmacount;    /* Zoom and byte count for DMA */
+	volatile u32 dmaccount;    /* Zoom and byte count for DMA */
 	u32 _unused9;
 	volatile u32 dmastart;    /* Pedal to the metal. */
 	u32 _unused10;

Index: sgint23.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips/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 16:50:51 -0000	1.1.1.1
+++ sgint23.h	9 Apr 2002 12:33:15 -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.
@@ -7,6 +6,7 @@
  * sgint23.h: Defines for the SGI INT2 and INT3 chipsets.
  *
  * Copyright (C) 1996 David S. Miller (dm...@en...)
+ * Copyright (C) 1997, 98, 1999, 2000 Ralf Baechle
  * Copyright (C) 1999 Andrew R. Baker (an...@ua...) - INT2 corrections
  */
 #ifndef _ASM_SGI_SGINT23_H
@@ -25,20 +25,8 @@
 #define SGINT_HPCDMA   41  /* INDY has 11 HPCDMA irq _sources_ */
 #define SGINT_END      52  /* End of 'spaces' */
 
-/* Individual interrupt definitions for the INDY and Indigo2
- */
-
-#define SGI_WD93_0_IRQ	SGINT_LOCAL0 + 1	/* 1st onboard WD93 */
-#define SGI_WD93_1_IRQ	SGINT_LOCAL0 + 2	/* 2nd onboard WD93 */
-#define SGI_ENET_IRQ	SGINT_LOCAL0 + 3	/* onboard ethernet */
-
-#define SGI_PANEL_IRQ	SGINT_LOCAL1 + 1	/* front panel */
-
-#define SGI_EISA_IRQ	SGINT_LOCAL2 + 3	/* EISA interrupts */
-#define SGI_KEYBOARD_IRQ	SGINT_LOCAL2 + 4	/* keyboard */
-#define SGI_SERIAL_IRQ	SGINT_LOCAL2 + 5	/* onboard serial */
-
-/* Individual interrupt definitions for the INDY and Indigo2
+/*
+ * Individual interrupt definitions for the INDY and Indigo2
  */
 
 #define SGI_WD93_0_IRQ	SGINT_LOCAL0 + 1	/* 1st onboard WD93 */
@@ -215,4 +203,4 @@
 extern void sgint_init(void);
 extern void indy_timer_init(void);
 
-#endif /* !(_ASM_SGINT23_H) */
+#endif /* _ASM_SGI_SGINT23_H */