patch-2.4.22 linux-2.4.22/include/asm-mips/sgi/sgi.h

Next file: linux-2.4.22/include/asm-mips/sgi/sgigio.h
Previous file: linux-2.4.22/include/asm-mips/sgi/mc.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/include/asm-mips/sgi/sgi.h linux-2.4.22/include/asm-mips/sgi/sgi.h
@@ -1,28 +1,33 @@
 /*
+ * 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.
+ *
  * sgi.h: Definitions specific to SGI machines.
  *
  * Copyright (C) 1996 David S. Miller (dm@sgi.com)
  */
-#ifndef __ASM_SGI_SGI_H
-#define __ASM_SGI_SGI_H
+#ifndef _ASM_SGI_SGI_H
+#define _ASM_SGI_SGI_H
 
 /* UP=UniProcessor MP=MultiProcessor(capable) */
 enum sgi_mach {
-	ip4,     /* R2k UP */
-	ip5,     /* R2k MP */
-	ip6,     /* R3k UP */
-	ip7,     /* R3k MP */
-	ip9,     /* R3k UP */
-	ip12,    /* R3kA UP, Indigo */
-	ip15,    /* R3kA MP */
-	ip17,    /* R4K UP */
-	ip19,    /* R4K MP */
-	ip20,    /* R4K UP, Indigo */
-	ip21,    /* TFP MP */
-	ip22,    /* R4x00 UP, Indigo2 */
-	ip25,    /* R10k MP */
-	ip26,    /* TFP UP, Indigo2 */
-	ip28,    /* R10k UP, Indigo2 */
+	ip4,	/* R2k UP */
+	ip5,	/* R2k MP */
+	ip6,	/* R3k UP */
+	ip7,	/* R3k MP */
+	ip9,	/* R3k UP */
+	ip12,	/* R3kA UP, Indigo */
+	ip15,	/* R3kA MP */
+	ip17,	/* R4K UP */
+	ip19,	/* R4K MP */
+	ip20,	/* R4K UP, Indigo */
+	ip21,	/* TFP MP */
+	ip22,	/* R4x00 UP, Indigo2 */
+	ip25,	/* R10k MP */
+	ip26,	/* TFP UP, Indigo2 */
+	ip27,	/* R10k MP, R12k MP, Origin */
+	ip28,	/* R10k UP, Indigo2 */
 	ip30,
 	ip32,
 };
@@ -39,4 +44,4 @@
 #define SGI_MSB(regaddr)   ((regaddr) | 0x3)
 #endif
 
-#endif /* __ASM_SGI_SGI_H */
+#endif /* _ASM_SGI_SGI_H */

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