[LV-kern-commit] CVS: kernel-2.4/include/asm-mips64/pci bridge.h,1.1.1.1,1.2

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

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

Modified Files:
	bridge.h 
Log Message:
Synch to 2.4.15 commit 1


Index: bridge.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips64/pci/bridge.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- bridge.h	14 Jan 2001 17:05:01 -0000	1.1.1.1
+++ bridge.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.
@@ -276,7 +275,7 @@
 				ds:2,		/* Data size	  */
 				gbr:1,		/* GBR enable	  */
 				vbpm:1,		/* VBPM message	  */
-				error:1,	/* Error occured  */
+				error:1,	/* Error occurred  */
 				barr:1,		/* Barrier op	  */
 				rsvd:8;
 		} berr_st;
@@ -828,11 +827,11 @@
 
 #define BRIDGE_INTERNAL_ATES	128
 
-/* ========================================================================
- *    Linux pci bus mappings to sn physical id's
+/*
+ * Linux pci bus mappings to sn physical id's
  */
-unsigned char bus_to_wid[256];	/* widget id for linux pci bus */
-unsigned char bus_to_nid[256];	/* nasid for linux pci bus */
-unsigned char num_bridges;	/* number of bridges in the system */
+extern unsigned char bus_to_wid[];	/* widget id for linux pci bus */
+extern unsigned char bus_to_nid[];	/* nasid for linux pci bus */
+extern unsigned char num_bridges;	/* number of bridges in the system */
 
 #endif /* _ASM_PCI_BRIDGE_H */