From: Pat Gefre kill $Id$ --- 25-akpm/arch/ia64/sn/io/cdl.c | 3 +-- 25-akpm/arch/ia64/sn/io/hwgfs/hcl_util.c | 3 +-- 25-akpm/arch/ia64/sn/io/io.c | 3 +-- 25-akpm/arch/ia64/sn/io/platform_init/irix_io_init.c | 3 +-- 25-akpm/arch/ia64/sn/io/sgi_if.c | 3 +-- 25-akpm/arch/ia64/sn/io/sgi_io_sim.c | 3 +-- 25-akpm/arch/ia64/sn/io/sn2/geo_op.c | 3 +-- 25-akpm/arch/ia64/sn/io/sn2/klconflib.c | 3 +-- 25-akpm/arch/ia64/sn/io/sn2/klgraph.c | 3 +-- 25-akpm/arch/ia64/sn/io/sn2/l1_command.c | 3 +-- 25-akpm/arch/ia64/sn/io/sn2/ml_SN_init.c | 3 +-- 25-akpm/arch/ia64/sn/io/sn2/ml_iograph.c | 3 +-- 25-akpm/arch/ia64/sn/io/sn2/module.c | 3 +-- 25-akpm/arch/ia64/sn/io/sn2/pciio.c | 3 +-- 25-akpm/arch/ia64/sn/io/sn2/shub.c | 3 +-- 25-akpm/arch/ia64/sn/io/sn2/shuberror.c | 3 +-- 25-akpm/arch/ia64/sn/io/sn2/shubio.c | 3 +-- 25-akpm/arch/ia64/sn/io/sn2/xbow.c | 3 +-- 25-akpm/arch/ia64/sn/io/sn2/xtalk.c | 3 +-- 25-akpm/arch/ia64/sn/io/xswitch.c | 3 +-- 25-akpm/include/asm-ia64/sn/alenlist.h | 3 +-- 25-akpm/include/asm-ia64/sn/arc/hinv.h | 3 +-- 25-akpm/include/asm-ia64/sn/arch.h | 3 +-- 25-akpm/include/asm-ia64/sn/cdl.h | 3 +-- 25-akpm/include/asm-ia64/sn/dmamap.h | 3 +-- 25-akpm/include/asm-ia64/sn/driver.h | 3 +-- 25-akpm/include/asm-ia64/sn/geo.h | 3 +-- 25-akpm/include/asm-ia64/sn/hcl.h | 3 +-- 25-akpm/include/asm-ia64/sn/hcl_util.h | 3 +-- 25-akpm/include/asm-ia64/sn/hwgfs.h | 8 +++----- 25-akpm/include/asm-ia64/sn/intr.h | 3 +-- 25-akpm/include/asm-ia64/sn/invent.h | 3 +-- 25-akpm/include/asm-ia64/sn/ioerror.h | 3 +-- 25-akpm/include/asm-ia64/sn/iograph.h | 3 +-- 25-akpm/include/asm-ia64/sn/klconfig.h | 3 +-- 25-akpm/include/asm-ia64/sn/ksys/elsc.h | 3 +-- 25-akpm/include/asm-ia64/sn/ksys/l1.h | 3 +-- 25-akpm/include/asm-ia64/sn/labelcl.h | 3 +-- 25-akpm/include/asm-ia64/sn/pci/bridge.h | 3 +-- 25-akpm/include/asm-ia64/sn/pci/pci_bus_cvlink.h | 3 +-- 25-akpm/include/asm-ia64/sn/pci/pci_defs.h | 3 +-- 25-akpm/include/asm-ia64/sn/pci/pcibr.h | 3 +-- 25-akpm/include/asm-ia64/sn/pci/pcibr_private.h | 3 +-- 25-akpm/include/asm-ia64/sn/pci/pciio.h | 3 +-- 25-akpm/include/asm-ia64/sn/pci/pciio_private.h | 3 +-- 25-akpm/include/asm-ia64/sn/pci/pic.h | 3 +-- 25-akpm/include/asm-ia64/sn/pio.h | 3 +-- 25-akpm/include/asm-ia64/sn/prio.h | 3 +-- 25-akpm/include/asm-ia64/sn/router.h | 3 +-- 25-akpm/include/asm-ia64/sn/slotnum.h | 3 +-- 25-akpm/include/asm-ia64/sn/sn2/arch.h | 3 +-- 25-akpm/include/asm-ia64/sn/sn2/geo.h | 3 +-- 25-akpm/include/asm-ia64/sn/sn2/intr.h | 3 +-- 25-akpm/include/asm-ia64/sn/sn2/shubio.h | 3 +-- 25-akpm/include/asm-ia64/sn/sn2/sn_private.h | 3 +-- 25-akpm/include/asm-ia64/sn/sn_fru.h | 3 +-- 25-akpm/include/asm-ia64/sn/sn_private.h | 3 +-- 25-akpm/include/asm-ia64/sn/vector.h | 3 +-- 25-akpm/include/asm-ia64/sn/xtalk/xbow.h | 3 +-- 25-akpm/include/asm-ia64/sn/xtalk/xbow_info.h | 3 +-- 25-akpm/include/asm-ia64/sn/xtalk/xswitch.h | 3 +-- 25-akpm/include/asm-ia64/sn/xtalk/xtalk.h | 3 +-- 25-akpm/include/asm-ia64/sn/xtalk/xtalk_private.h | 3 +-- 25-akpm/include/asm-ia64/sn/xtalk/xtalkaddrs.h | 3 +-- 25-akpm/include/asm-ia64/sn/xtalk/xwidget.h | 3 +-- 65 files changed, 67 insertions(+), 133 deletions(-) diff -puN arch/ia64/sn/io/cdl.c~sn07 arch/ia64/sn/io/cdl.c --- 25/arch/ia64/sn/io/cdl.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/cdl.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/hwgfs/hcl_util.c~sn07 arch/ia64/sn/io/hwgfs/hcl_util.c --- 25/arch/ia64/sn/io/hwgfs/hcl_util.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/hwgfs/hcl_util.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/io.c~sn07 arch/ia64/sn/io/io.c --- 25/arch/ia64/sn/io/io.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/io.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/platform_init/irix_io_init.c~sn07 arch/ia64/sn/io/platform_init/irix_io_init.c --- 25/arch/ia64/sn/io/platform_init/irix_io_init.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/platform_init/irix_io_init.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/sgi_if.c~sn07 arch/ia64/sn/io/sgi_if.c --- 25/arch/ia64/sn/io/sgi_if.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/sgi_if.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/sgi_io_sim.c~sn07 arch/ia64/sn/io/sgi_io_sim.c --- 25/arch/ia64/sn/io/sgi_io_sim.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/sgi_io_sim.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/sn2/geo_op.c~sn07 arch/ia64/sn/io/sn2/geo_op.c --- 25/arch/ia64/sn/io/sn2/geo_op.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/sn2/geo_op.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/sn2/klconflib.c~sn07 arch/ia64/sn/io/sn2/klconflib.c --- 25/arch/ia64/sn/io/sn2/klconflib.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/sn2/klconflib.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/sn2/klgraph.c~sn07 arch/ia64/sn/io/sn2/klgraph.c --- 25/arch/ia64/sn/io/sn2/klgraph.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/sn2/klgraph.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/sn2/l1_command.c~sn07 arch/ia64/sn/io/sn2/l1_command.c --- 25/arch/ia64/sn/io/sn2/l1_command.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/sn2/l1_command.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/sn2/ml_iograph.c~sn07 arch/ia64/sn/io/sn2/ml_iograph.c --- 25/arch/ia64/sn/io/sn2/ml_iograph.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/sn2/ml_iograph.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/sn2/ml_SN_init.c~sn07 arch/ia64/sn/io/sn2/ml_SN_init.c --- 25/arch/ia64/sn/io/sn2/ml_SN_init.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/sn2/ml_SN_init.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/sn2/module.c~sn07 arch/ia64/sn/io/sn2/module.c --- 25/arch/ia64/sn/io/sn2/module.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/sn2/module.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/sn2/pciio.c~sn07 arch/ia64/sn/io/sn2/pciio.c --- 25/arch/ia64/sn/io/sn2/pciio.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/sn2/pciio.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/sn2/shub.c~sn07 arch/ia64/sn/io/sn2/shub.c --- 25/arch/ia64/sn/io/sn2/shub.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/sn2/shub.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/sn2/shuberror.c~sn07 arch/ia64/sn/io/sn2/shuberror.c --- 25/arch/ia64/sn/io/sn2/shuberror.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/sn2/shuberror.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/sn2/shubio.c~sn07 arch/ia64/sn/io/sn2/shubio.c --- 25/arch/ia64/sn/io/sn2/shubio.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/sn2/shubio.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/sn2/xbow.c~sn07 arch/ia64/sn/io/sn2/xbow.c --- 25/arch/ia64/sn/io/sn2/xbow.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/sn2/xbow.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/sn2/xtalk.c~sn07 arch/ia64/sn/io/sn2/xtalk.c --- 25/arch/ia64/sn/io/sn2/xtalk.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/sn2/xtalk.c Thu Jan 8 15:14:19 2004 @@ -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 -puN arch/ia64/sn/io/xswitch.c~sn07 arch/ia64/sn/io/xswitch.c --- 25/arch/ia64/sn/io/xswitch.c~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/arch/ia64/sn/io/xswitch.c Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/alenlist.h~sn07 include/asm-ia64/sn/alenlist.h --- 25/include/asm-ia64/sn/alenlist.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/alenlist.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/arch.h~sn07 include/asm-ia64/sn/arch.h --- 25/include/asm-ia64/sn/arch.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/arch.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/arc/hinv.h~sn07 include/asm-ia64/sn/arc/hinv.h --- 25/include/asm-ia64/sn/arc/hinv.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/arc/hinv.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/cdl.h~sn07 include/asm-ia64/sn/cdl.h --- 25/include/asm-ia64/sn/cdl.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/cdl.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/dmamap.h~sn07 include/asm-ia64/sn/dmamap.h --- 25/include/asm-ia64/sn/dmamap.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/dmamap.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/driver.h~sn07 include/asm-ia64/sn/driver.h --- 25/include/asm-ia64/sn/driver.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/driver.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/geo.h~sn07 include/asm-ia64/sn/geo.h --- 25/include/asm-ia64/sn/geo.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/geo.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/hcl.h~sn07 include/asm-ia64/sn/hcl.h --- 25/include/asm-ia64/sn/hcl.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/hcl.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/hcl_util.h~sn07 include/asm-ia64/sn/hcl_util.h --- 25/include/asm-ia64/sn/hcl_util.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/hcl_util.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/hwgfs.h~sn07 include/asm-ia64/sn/hwgfs.h --- 25/include/asm-ia64/sn/hwgfs.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/hwgfs.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/intr.h~sn07 include/asm-ia64/sn/intr.h --- 25/include/asm-ia64/sn/intr.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/intr.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/invent.h~sn07 include/asm-ia64/sn/invent.h --- 25/include/asm-ia64/sn/invent.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/invent.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/ioerror.h~sn07 include/asm-ia64/sn/ioerror.h --- 25/include/asm-ia64/sn/ioerror.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/ioerror.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/iograph.h~sn07 include/asm-ia64/sn/iograph.h --- 25/include/asm-ia64/sn/iograph.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/iograph.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/klconfig.h~sn07 include/asm-ia64/sn/klconfig.h --- 25/include/asm-ia64/sn/klconfig.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/klconfig.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/ksys/elsc.h~sn07 include/asm-ia64/sn/ksys/elsc.h --- 25/include/asm-ia64/sn/ksys/elsc.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/ksys/elsc.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/ksys/l1.h~sn07 include/asm-ia64/sn/ksys/l1.h --- 25/include/asm-ia64/sn/ksys/l1.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/ksys/l1.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/labelcl.h~sn07 include/asm-ia64/sn/labelcl.h --- 25/include/asm-ia64/sn/labelcl.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/labelcl.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/pci/bridge.h~sn07 include/asm-ia64/sn/pci/bridge.h --- 25/include/asm-ia64/sn/pci/bridge.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/pci/bridge.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/pci/pcibr.h~sn07 include/asm-ia64/sn/pci/pcibr.h --- 25/include/asm-ia64/sn/pci/pcibr.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/pci/pcibr.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/pci/pcibr_private.h~sn07 include/asm-ia64/sn/pci/pcibr_private.h --- 25/include/asm-ia64/sn/pci/pcibr_private.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/pci/pcibr_private.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/pci/pci_bus_cvlink.h~sn07 include/asm-ia64/sn/pci/pci_bus_cvlink.h --- 25/include/asm-ia64/sn/pci/pci_bus_cvlink.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/pci/pci_bus_cvlink.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/pci/pci_defs.h~sn07 include/asm-ia64/sn/pci/pci_defs.h --- 25/include/asm-ia64/sn/pci/pci_defs.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/pci/pci_defs.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/pci/pciio.h~sn07 include/asm-ia64/sn/pci/pciio.h --- 25/include/asm-ia64/sn/pci/pciio.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/pci/pciio.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/pci/pciio_private.h~sn07 include/asm-ia64/sn/pci/pciio_private.h --- 25/include/asm-ia64/sn/pci/pciio_private.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/pci/pciio_private.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/pci/pic.h~sn07 include/asm-ia64/sn/pci/pic.h --- 25/include/asm-ia64/sn/pci/pic.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/pci/pic.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/pio.h~sn07 include/asm-ia64/sn/pio.h --- 25/include/asm-ia64/sn/pio.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/pio.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/prio.h~sn07 include/asm-ia64/sn/prio.h --- 25/include/asm-ia64/sn/prio.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/prio.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/router.h~sn07 include/asm-ia64/sn/router.h --- 25/include/asm-ia64/sn/router.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/router.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/slotnum.h~sn07 include/asm-ia64/sn/slotnum.h --- 25/include/asm-ia64/sn/slotnum.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/slotnum.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/sn2/arch.h~sn07 include/asm-ia64/sn/sn2/arch.h --- 25/include/asm-ia64/sn/sn2/arch.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/sn2/arch.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/sn2/geo.h~sn07 include/asm-ia64/sn/sn2/geo.h --- 25/include/asm-ia64/sn/sn2/geo.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/sn2/geo.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/sn2/intr.h~sn07 include/asm-ia64/sn/sn2/intr.h --- 25/include/asm-ia64/sn/sn2/intr.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/sn2/intr.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/sn2/shubio.h~sn07 include/asm-ia64/sn/sn2/shubio.h --- 25/include/asm-ia64/sn/sn2/shubio.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/sn2/shubio.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/sn2/sn_private.h~sn07 include/asm-ia64/sn/sn2/sn_private.h --- 25/include/asm-ia64/sn/sn2/sn_private.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/sn2/sn_private.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/sn_fru.h~sn07 include/asm-ia64/sn/sn_fru.h --- 25/include/asm-ia64/sn/sn_fru.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/sn_fru.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/sn_private.h~sn07 include/asm-ia64/sn/sn_private.h --- 25/include/asm-ia64/sn/sn_private.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/sn_private.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/vector.h~sn07 include/asm-ia64/sn/vector.h --- 25/include/asm-ia64/sn/vector.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/vector.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/xtalk/xbow.h~sn07 include/asm-ia64/sn/xtalk/xbow.h --- 25/include/asm-ia64/sn/xtalk/xbow.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/xtalk/xbow.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/xtalk/xbow_info.h~sn07 include/asm-ia64/sn/xtalk/xbow_info.h --- 25/include/asm-ia64/sn/xtalk/xbow_info.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/xtalk/xbow_info.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/xtalk/xswitch.h~sn07 include/asm-ia64/sn/xtalk/xswitch.h --- 25/include/asm-ia64/sn/xtalk/xswitch.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/xtalk/xswitch.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/xtalk/xtalkaddrs.h~sn07 include/asm-ia64/sn/xtalk/xtalkaddrs.h --- 25/include/asm-ia64/sn/xtalk/xtalkaddrs.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/xtalk/xtalkaddrs.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/xtalk/xtalk.h~sn07 include/asm-ia64/sn/xtalk/xtalk.h --- 25/include/asm-ia64/sn/xtalk/xtalk.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/xtalk/xtalk.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/xtalk/xtalk_private.h~sn07 include/asm-ia64/sn/xtalk/xtalk_private.h --- 25/include/asm-ia64/sn/xtalk/xtalk_private.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/xtalk/xtalk_private.h Thu Jan 8 15:14:19 2004 @@ -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 -puN include/asm-ia64/sn/xtalk/xwidget.h~sn07 include/asm-ia64/sn/xtalk/xwidget.h --- 25/include/asm-ia64/sn/xtalk/xwidget.h~sn07 Thu Jan 8 15:14:19 2004 +++ 25-akpm/include/asm-ia64/sn/xtalk/xwidget.h Thu Jan 8 15:14:19 2004 @@ -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. _