# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1434  -> 1.1435 
#	include/asm-ia64/sn/xtalk/xwidget.h	1.4     -> 1.5    
#	include/asm-ia64/sn/pci/pcibr_private.h	1.10    -> 1.11   
#	arch/ia64/sn/io/sn2/ml_iograph.c	1.5     -> 1.6    
#	arch/ia64/sn/io/hwgfs/hcl_util.c	1.1     -> 1.2    
#	include/asm-ia64/sn/pci/pciio.h	1.7     -> 1.8    
#	arch/ia64/sn/io/sn2/xtalk.c	1.2     -> 1.3    
#	arch/ia64/sn/io/sn2/ml_SN_init.c	1.3     -> 1.4    
#	arch/ia64/sn/io/sn2/klconflib.c	1.3     -> 1.4    
#	include/asm-ia64/sn/sn_fru.h	1.4     -> 1.5    
#	arch/ia64/sn/io/sn2/module.c	1.4     -> 1.5    
#	include/asm-ia64/sn/iograph.h	1.5     -> 1.6    
#	include/asm-ia64/sn/hcl_util.h	1.4     -> 1.5    
#	include/asm-ia64/sn/vector.h	1.4     -> 1.5    
#	include/asm-ia64/sn/sn_private.h	1.4     -> 1.5    
#	include/asm-ia64/sn/pio.h	1.4     -> 1.5    
#	include/asm-ia64/sn/invent.h	1.5     -> 1.6    
#	include/asm-ia64/sn/sn2/sn_private.h	1.5     -> 1.6    
#	include/asm-ia64/sn/hwgfs.h	1.2     -> 1.3    
#	include/asm-ia64/sn/pci/bridge.h	1.8     -> 1.9    
#	arch/ia64/sn/io/xswitch.c	1.7     -> 1.8    
#	include/asm-ia64/sn/arc/hinv.h	1.4     -> 1.5    
#	include/asm-ia64/sn/intr.h	1.5     -> 1.6    
#	include/asm-ia64/sn/xtalk/xbow.h	1.5     -> 1.6    
#	arch/ia64/sn/io/cdl.c	1.5     -> 1.6    
#	include/asm-ia64/sn/pci/pci_defs.h	1.4     -> 1.5    
#	include/asm-ia64/sn/router.h	1.6     -> 1.7    
#	include/asm-ia64/sn/klconfig.h	1.6     -> 1.7    
#	include/asm-ia64/sn/ksys/l1.h	1.7     -> 1.8    
#	arch/ia64/sn/io/sgi_io_sim.c	1.5     -> 1.6    
#	include/asm-ia64/sn/sn2/arch.h	1.3     -> 1.4    
#	include/asm-ia64/sn/hcl.h	1.7     -> 1.8    
#	arch/ia64/sn/io/sn2/l1_command.c	1.3     -> 1.4    
#	include/asm-ia64/sn/arch.h	1.5     -> 1.6    
#	arch/ia64/sn/io/sn2/xbow.c	1.5     -> 1.6    
#	include/asm-ia64/sn/driver.h	1.3     -> 1.4    
#	arch/ia64/sn/io/io.c	1.8     -> 1.9    
#	include/asm-ia64/sn/sn2/shubio.h	1.4     -> 1.5    
#	include/asm-ia64/sn/prio.h	1.3     -> 1.4    
#	arch/ia64/sn/io/platform_init/irix_io_init.c	1.2     -> 1.3    
#	arch/ia64/sn/io/sgi_if.c	1.6     -> 1.7    
#	include/asm-ia64/sn/pci/pic.h	1.1     -> 1.2    
#	include/asm-ia64/sn/alenlist.h	1.6     -> 1.7    
#	arch/ia64/sn/io/sn2/shub.c	1.7     -> 1.8    
#	include/asm-ia64/sn/pci/pciio_private.h	1.6     -> 1.7    
#	arch/ia64/sn/io/sn2/geo_op.c	1.1     -> 1.2    
#	include/asm-ia64/sn/xtalk/xtalk.h	1.6     -> 1.7    
#	arch/ia64/sn/io/sn2/klgraph.c	1.3     -> 1.4    
#	include/asm-ia64/sn/geo.h	1.2     -> 1.3    
#	include/asm-ia64/sn/cdl.h	1.4     -> 1.5    
#	include/asm-ia64/sn/xtalk/xbow_info.h	1.4     -> 1.5    
#	include/asm-ia64/sn/xtalk/xtalk_private.h	1.6     -> 1.7    
#	include/asm-ia64/sn/labelcl.h	1.4     -> 1.5    
#	include/asm-ia64/sn/xtalk/xtalkaddrs.h	1.4     -> 1.5    
#	include/asm-ia64/sn/xtalk/xswitch.h	1.4     -> 1.5    
#	arch/ia64/sn/io/sn2/shubio.c	1.2     -> 1.3    
#	include/asm-ia64/sn/pci/pcibr.h	1.6     -> 1.7    
#	include/asm-ia64/sn/ioerror.h	1.6     -> 1.7    
#	include/asm-ia64/sn/ksys/elsc.h	1.6     -> 1.7    
#	include/asm-ia64/sn/sn2/intr.h	1.4     -> 1.5    
#	include/asm-ia64/sn/dmamap.h	1.5     -> 1.6    
#	arch/ia64/sn/io/sn2/shuberror.c	1.7     -> 1.8    
#	include/asm-ia64/sn/pci/pci_bus_cvlink.h	1.6     -> 1.7    
#	include/asm-ia64/sn/slotnum.h	1.4     -> 1.5    
#	arch/ia64/sn/io/sn2/pciio.c	1.6     -> 1.7    
#	include/asm-ia64/sn/sn2/geo.h	1.1     -> 1.2    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/11/07	jbarnes@tomahawk.engr.sgi.com	1.1435
# kill $Id$
# --------------------------------------------
#
diff -Nru a/arch/ia64/sn/io/cdl.c b/arch/ia64/sn/io/cdl.c
--- a/arch/ia64/sn/io/cdl.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/cdl.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/arch/ia64/sn/io/hwgfs/hcl_util.c b/arch/ia64/sn/io/hwgfs/hcl_util.c
--- a/arch/ia64/sn/io/hwgfs/hcl_util.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/hwgfs/hcl_util.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/arch/ia64/sn/io/io.c b/arch/ia64/sn/io/io.c
--- a/arch/ia64/sn/io/io.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/io.c	Fri Nov  7 17:49:31 2003
@@ -1,5 +1,4 @@
-/* $Id: io.c,v 1.2 2001/06/26 14:02:43 pfg Exp $
- *
+/*
  * 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.
diff -Nru a/arch/ia64/sn/io/platform_init/irix_io_init.c b/arch/ia64/sn/io/platform_init/irix_io_init.c
--- a/arch/ia64/sn/io/platform_init/irix_io_init.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/platform_init/irix_io_init.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/arch/ia64/sn/io/sgi_if.c b/arch/ia64/sn/io/sgi_if.c
--- a/arch/ia64/sn/io/sgi_if.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/sgi_if.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/arch/ia64/sn/io/sgi_io_sim.c b/arch/ia64/sn/io/sgi_io_sim.c
--- a/arch/ia64/sn/io/sgi_io_sim.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/sgi_io_sim.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/arch/ia64/sn/io/sn2/geo_op.c b/arch/ia64/sn/io/sn2/geo_op.c
--- a/arch/ia64/sn/io/sn2/geo_op.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/sn2/geo_op.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/arch/ia64/sn/io/sn2/klconflib.c b/arch/ia64/sn/io/sn2/klconflib.c
--- a/arch/ia64/sn/io/sn2/klconflib.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/sn2/klconflib.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/arch/ia64/sn/io/sn2/klgraph.c b/arch/ia64/sn/io/sn2/klgraph.c
--- a/arch/ia64/sn/io/sn2/klgraph.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/sn2/klgraph.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/arch/ia64/sn/io/sn2/l1_command.c b/arch/ia64/sn/io/sn2/l1_command.c
--- a/arch/ia64/sn/io/sn2/l1_command.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/sn2/l1_command.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/arch/ia64/sn/io/sn2/ml_SN_init.c b/arch/ia64/sn/io/sn2/ml_SN_init.c
--- a/arch/ia64/sn/io/sn2/ml_SN_init.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/sn2/ml_SN_init.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/arch/ia64/sn/io/sn2/ml_iograph.c b/arch/ia64/sn/io/sn2/ml_iograph.c
--- a/arch/ia64/sn/io/sn2/ml_iograph.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/sn2/ml_iograph.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/arch/ia64/sn/io/sn2/module.c b/arch/ia64/sn/io/sn2/module.c
--- a/arch/ia64/sn/io/sn2/module.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/sn2/module.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/arch/ia64/sn/io/sn2/pciio.c b/arch/ia64/sn/io/sn2/pciio.c
--- a/arch/ia64/sn/io/sn2/pciio.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/sn2/pciio.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/arch/ia64/sn/io/sn2/shub.c b/arch/ia64/sn/io/sn2/shub.c
--- a/arch/ia64/sn/io/sn2/shub.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/sn2/shub.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/arch/ia64/sn/io/sn2/shuberror.c b/arch/ia64/sn/io/sn2/shuberror.c
--- a/arch/ia64/sn/io/sn2/shuberror.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/sn2/shuberror.c	Fri Nov  7 17:49:31 2003
@@ -1,5 +1,4 @@
-/* $Id: shuberror.c,v 1.1 2002/02/28 17:31:25 marcelo Exp $
- *
+/*
  * 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.
diff -Nru a/arch/ia64/sn/io/sn2/shubio.c b/arch/ia64/sn/io/sn2/shubio.c
--- a/arch/ia64/sn/io/sn2/shubio.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/sn2/shubio.c	Fri Nov  7 17:49:31 2003
@@ -1,5 +1,4 @@
-/* $Id: shubio.c,v 1.1 2002/02/28 17:31:25 marcelo Exp $
- *
+/*
  * 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.
diff -Nru a/arch/ia64/sn/io/sn2/xbow.c b/arch/ia64/sn/io/sn2/xbow.c
--- a/arch/ia64/sn/io/sn2/xbow.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/sn2/xbow.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/arch/ia64/sn/io/sn2/xtalk.c b/arch/ia64/sn/io/sn2/xtalk.c
--- a/arch/ia64/sn/io/sn2/xtalk.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/sn2/xtalk.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/arch/ia64/sn/io/xswitch.c b/arch/ia64/sn/io/xswitch.c
--- a/arch/ia64/sn/io/xswitch.c	Fri Nov  7 17:49:31 2003
+++ b/arch/ia64/sn/io/xswitch.c	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/alenlist.h b/include/asm-ia64/sn/alenlist.h
--- a/include/asm-ia64/sn/alenlist.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/alenlist.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/arc/hinv.h b/include/asm-ia64/sn/arc/hinv.h
--- a/include/asm-ia64/sn/arc/hinv.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/arc/hinv.h	Fri Nov  7 17:49:31 2003
@@ -6,8 +6,7 @@
  * Copyright (C) 2000-2003 Silicon Graphics, Inc. All rights reserved.
  */
 
-/* $Id$
- *
+/*
  * ARCS hardware/memory inventory/configuration and system ID definitions.
  */
 #ifndef _ASM_SN_ARC_HINV_H
diff -Nru a/include/asm-ia64/sn/arch.h b/include/asm-ia64/sn/arch.h
--- a/include/asm-ia64/sn/arch.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/arch.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/cdl.h b/include/asm-ia64/sn/cdl.h
--- a/include/asm-ia64/sn/cdl.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/cdl.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/dmamap.h b/include/asm-ia64/sn/dmamap.h
--- a/include/asm-ia64/sn/dmamap.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/dmamap.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/driver.h b/include/asm-ia64/sn/driver.h
--- a/include/asm-ia64/sn/driver.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/driver.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/geo.h b/include/asm-ia64/sn/geo.h
--- a/include/asm-ia64/sn/geo.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/geo.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/hcl.h b/include/asm-ia64/sn/hcl.h
--- a/include/asm-ia64/sn/hcl.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/hcl.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/hcl_util.h b/include/asm-ia64/sn/hcl_util.h
--- a/include/asm-ia64/sn/hcl_util.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/hcl_util.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/hwgfs.h b/include/asm-ia64/sn/hwgfs.h
--- a/include/asm-ia64/sn/hwgfs.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/hwgfs.h	Fri Nov  7 17:49:31 2003
@@ -1,14 +1,12 @@
-#ifndef _ASM_IA64_SN_HWGFS_H
-#define _ASM_IA64_SN_HWGFS_H
-
-/* $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.
  *
  * Copyright (C) 1992 - 1997, 2000-2003 Silicon Graphics, Inc. All rights reserved.
  */
+#ifndef _ASM_IA64_SN_HWGFS_H
+#define _ASM_IA64_SN_HWGFS_H
 
 typedef struct dentry *hwgfs_handle_t;
 
diff -Nru a/include/asm-ia64/sn/intr.h b/include/asm-ia64/sn/intr.h
--- a/include/asm-ia64/sn/intr.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/intr.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/invent.h b/include/asm-ia64/sn/invent.h
--- a/include/asm-ia64/sn/invent.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/invent.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/ioerror.h b/include/asm-ia64/sn/ioerror.h
--- a/include/asm-ia64/sn/ioerror.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/ioerror.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/iograph.h b/include/asm-ia64/sn/iograph.h
--- a/include/asm-ia64/sn/iograph.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/iograph.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/klconfig.h b/include/asm-ia64/sn/klconfig.h
--- a/include/asm-ia64/sn/klconfig.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/klconfig.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/ksys/elsc.h b/include/asm-ia64/sn/ksys/elsc.h
--- a/include/asm-ia64/sn/ksys/elsc.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/ksys/elsc.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/ksys/l1.h b/include/asm-ia64/sn/ksys/l1.h
--- a/include/asm-ia64/sn/ksys/l1.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/ksys/l1.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/labelcl.h b/include/asm-ia64/sn/labelcl.h
--- a/include/asm-ia64/sn/labelcl.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/labelcl.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/pci/bridge.h b/include/asm-ia64/sn/pci/bridge.h
--- a/include/asm-ia64/sn/pci/bridge.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/pci/bridge.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/pci/pci_bus_cvlink.h b/include/asm-ia64/sn/pci/pci_bus_cvlink.h
--- a/include/asm-ia64/sn/pci/pci_bus_cvlink.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/pci/pci_bus_cvlink.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/pci/pci_defs.h b/include/asm-ia64/sn/pci/pci_defs.h
--- a/include/asm-ia64/sn/pci/pci_defs.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/pci/pci_defs.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/pci/pcibr.h b/include/asm-ia64/sn/pci/pcibr.h
--- a/include/asm-ia64/sn/pci/pcibr.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/pci/pcibr.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/pci/pcibr_private.h b/include/asm-ia64/sn/pci/pcibr_private.h
--- a/include/asm-ia64/sn/pci/pcibr_private.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/pci/pcibr_private.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/pci/pciio.h b/include/asm-ia64/sn/pci/pciio.h
--- a/include/asm-ia64/sn/pci/pciio.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/pci/pciio.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/pci/pciio_private.h b/include/asm-ia64/sn/pci/pciio_private.h
--- a/include/asm-ia64/sn/pci/pciio_private.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/pci/pciio_private.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/pci/pic.h b/include/asm-ia64/sn/pci/pic.h
--- a/include/asm-ia64/sn/pci/pic.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/pci/pic.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/pio.h b/include/asm-ia64/sn/pio.h
--- a/include/asm-ia64/sn/pio.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/pio.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/prio.h b/include/asm-ia64/sn/prio.h
--- a/include/asm-ia64/sn/prio.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/prio.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/router.h b/include/asm-ia64/sn/router.h
--- a/include/asm-ia64/sn/router.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/router.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/slotnum.h b/include/asm-ia64/sn/slotnum.h
--- a/include/asm-ia64/sn/slotnum.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/slotnum.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/sn2/arch.h b/include/asm-ia64/sn/sn2/arch.h
--- a/include/asm-ia64/sn/sn2/arch.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/sn2/arch.h	Fri Nov  7 17:49:31 2003
@@ -1,5 +1,4 @@
-/* $Id: arch.h,v 1.1 2002/02/28 17:31:25 marcelo Exp $
- *
+/*
  * 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.
diff -Nru a/include/asm-ia64/sn/sn2/geo.h b/include/asm-ia64/sn/sn2/geo.h
--- a/include/asm-ia64/sn/sn2/geo.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/sn2/geo.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/sn2/intr.h b/include/asm-ia64/sn/sn2/intr.h
--- a/include/asm-ia64/sn/sn2/intr.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/sn2/intr.h	Fri Nov  7 17:49:31 2003
@@ -1,5 +1,4 @@
-/* $Id: intr.h,v 1.1 2002/02/28 17:31:25 marcelo Exp $
- *
+/*
  * 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.
diff -Nru a/include/asm-ia64/sn/sn2/shubio.h b/include/asm-ia64/sn/sn2/shubio.h
--- a/include/asm-ia64/sn/sn2/shubio.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/sn2/shubio.h	Fri Nov  7 17:49:31 2003
@@ -1,5 +1,4 @@
-/* $Id: shubio.h,v 1.1 2002/02/28 17:31:25 marcelo Exp $
- *
+/*
  * 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.
diff -Nru a/include/asm-ia64/sn/sn2/sn_private.h b/include/asm-ia64/sn/sn2/sn_private.h
--- a/include/asm-ia64/sn/sn2/sn_private.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/sn2/sn_private.h	Fri Nov  7 17:49:31 2003
@@ -1,5 +1,4 @@
-/* $Id: sn_private.h,v 1.1 2002/02/28 17:31:26 marcelo Exp $
- *
+/*
  * 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.
diff -Nru a/include/asm-ia64/sn/sn_fru.h b/include/asm-ia64/sn/sn_fru.h
--- a/include/asm-ia64/sn/sn_fru.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/sn_fru.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/sn_private.h b/include/asm-ia64/sn/sn_private.h
--- a/include/asm-ia64/sn/sn_private.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/sn_private.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/vector.h b/include/asm-ia64/sn/vector.h
--- a/include/asm-ia64/sn/vector.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/vector.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/xtalk/xbow.h b/include/asm-ia64/sn/xtalk/xbow.h
--- a/include/asm-ia64/sn/xtalk/xbow.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/xtalk/xbow.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/xtalk/xbow_info.h b/include/asm-ia64/sn/xtalk/xbow_info.h
--- a/include/asm-ia64/sn/xtalk/xbow_info.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/xtalk/xbow_info.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/xtalk/xswitch.h b/include/asm-ia64/sn/xtalk/xswitch.h
--- a/include/asm-ia64/sn/xtalk/xswitch.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/xtalk/xswitch.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/xtalk/xtalk.h b/include/asm-ia64/sn/xtalk/xtalk.h
--- a/include/asm-ia64/sn/xtalk/xtalk.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/xtalk/xtalk.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/xtalk/xtalk_private.h b/include/asm-ia64/sn/xtalk/xtalk_private.h
--- a/include/asm-ia64/sn/xtalk/xtalk_private.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/xtalk/xtalk_private.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/xtalk/xtalkaddrs.h b/include/asm-ia64/sn/xtalk/xtalkaddrs.h
--- a/include/asm-ia64/sn/xtalk/xtalkaddrs.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/xtalk/xtalkaddrs.h	Fri Nov  7 17:49:31 2003
@@ -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.
diff -Nru a/include/asm-ia64/sn/xtalk/xwidget.h b/include/asm-ia64/sn/xtalk/xwidget.h
--- a/include/asm-ia64/sn/xtalk/xwidget.h	Fri Nov  7 17:49:31 2003
+++ b/include/asm-ia64/sn/xtalk/xwidget.h	Fri Nov  7 17:49:31 2003
@@ -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.