# 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.1500 -> 1.1501 # include/asm-ia64/sn/sn_fru.h 1.4 -> 1.5 # include/asm-ia64/sn/sn2/shub_mmr_t.h 1.3 -> 1.4 # 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/hwgfs.h 1.2 -> 1.3 # include/asm-ia64/sn/intr.h 1.5 -> 1.6 # include/asm-ia64/sn/router.h 1.6 -> 1.7 # include/asm-ia64/sn/arch.h 1.5 -> 1.6 # include/asm-ia64/sn/driver.h 1.3 -> 1.4 # include/asm-ia64/sn/prio.h 1.3 -> 1.4 # include/asm-ia64/sn/alenlist.h 1.6 -> 1.7 # include/asm-ia64/sn/geo.h 1.2 -> 1.3 # include/asm-ia64/sn/cdl.h 1.4 -> 1.5 # include/asm-ia64/sn/clksupport.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 # 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/ioconfig_bus.h 1.1 -> 1.2 # include/asm-ia64/sn/sn2/shub_md.h 1.4 -> 1.5 # include/asm-ia64/sn/sn2/shub.h 1.3 -> 1.4 # include/asm-ia64/sn/pci/pci_bus_cvlink.h 1.6 -> 1.7 # include/asm-ia64/sn/slotnum.h 1.4 -> 1.5 # include/asm-ia64/sn/sn2/geo.h 1.1 -> 1.2 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/11/24 jbarnes@tomahawk.engr.sgi.com 1.1501 # sn2 header file cleanup # -------------------------------------------- # diff -Nru a/include/asm-ia64/sn/alenlist.h b/include/asm-ia64/sn/alenlist.h --- a/include/asm-ia64/sn/alenlist.h Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/alenlist.h Mon Nov 24 12:47:33 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/arch.h b/include/asm-ia64/sn/arch.h --- a/include/asm-ia64/sn/arch.h Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/arch.h Mon Nov 24 12:47:33 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 Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/cdl.h Mon Nov 24 12:47:33 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. @@ -9,7 +8,9 @@ #ifndef _ASM_IA64_SN_CDL_H #define _ASM_IA64_SN_CDL_H +#ifdef __KERNEL__ #include +#endif struct cdl { int part_num; /* Part part number */ diff -Nru a/include/asm-ia64/sn/clksupport.h b/include/asm-ia64/sn/clksupport.h --- a/include/asm-ia64/sn/clksupport.h Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/clksupport.h Mon Nov 24 12:47:33 2003 @@ -1,5 +1,4 @@ /* - * * 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. @@ -31,9 +30,7 @@ typedef long clkreg_t; extern unsigned long sn_rtc_cycles_per_second; -extern unsigned long sn_rtc_usec_per_cyc; extern unsigned long sn_rtc_per_itc; -extern unsigned long sn_rtc_delta; #include diff -Nru a/include/asm-ia64/sn/driver.h b/include/asm-ia64/sn/driver.h --- a/include/asm-ia64/sn/driver.h Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/driver.h Mon Nov 24 12:47:33 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 Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/geo.h Mon Nov 24 12:47:33 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. @@ -7,8 +6,8 @@ * Copyright (C) 1992 - 1997, 2000-2003 Silicon Graphics, Inc. All rights reserved. */ -#ifndef __SYS_GEO_H__ -#define __SYS_GEO_H__ +#ifndef _ASM_IA64_SN_GEO_H +#define _ASM_IA64_SN_GEO_H /* Include a platform-specific geo.h. It must define at least: * geoid_t: Geographic identifier data type @@ -43,4 +42,4 @@ extern geoid_t hwcfg_geo_get_self(geo_type_t type); extern geoid_t hwcfg_geo_get_by_nasid(geo_type_t type, nasid_t nasid); -#endif /* __SYS_GEO_H__ */ +#endif /* _ASM_IA64_SN_GEO_H */ 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 Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/hcl_util.h Mon Nov 24 12:47:33 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 Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/hwgfs.h Mon Nov 24 12:47:33 2003 @@ -1,15 +1,13 @@ #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. */ - typedef struct dentry *hwgfs_handle_t; extern hwgfs_handle_t hwgfs_register(hwgfs_handle_t dir, const char *name, @@ -32,4 +30,4 @@ extern void *hwgfs_get_info(hwgfs_handle_t de); extern int hwgfs_set_info(hwgfs_handle_t de, void *info); -#endif +#endif /* _ASM_IA64_SN_HWGFS_H */ diff -Nru a/include/asm-ia64/sn/intr.h b/include/asm-ia64/sn/intr.h --- a/include/asm-ia64/sn/intr.h Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/intr.h Mon Nov 24 12:47:33 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/ioconfig_bus.h b/include/asm-ia64/sn/ioconfig_bus.h --- a/include/asm-ia64/sn/ioconfig_bus.h Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/ioconfig_bus.h Mon Nov 24 12:47:33 2003 @@ -1,35 +1,14 @@ /* - * Copyright (c) 2003 Silicon Graphics, Inc. All Rights Reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it would be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * Further, this software is distributed without any warranty that it is - * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or - * otherwise, applies only to this software file. Patent licenses, if - * any, provided herein do not apply to combinations of this program with - * other software, or any other product whatsoever. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. - * - * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, - * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * - * http://oss.sgi.com/projects/GenInfo/NoticeExplan + * 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) 2003 Silicon Graphics, Inc. All Rights Reserved. */ +#ifndef _ASM_IA64_SN_IOCONFIG_BUS_H +#define _ASM_IA64_SN_IOCONFIG_BUS_H + #define IOCONFIG_PCIBUS "/boot/efi/ioconfig_pcibus" #define POUND_CHAR '#' #define MAX_LINE_LEN 128 @@ -44,3 +23,5 @@ struct ascii_moduleid{ unsigned char io_moduleid[8]; /* pci path name */ }; + +#endif /* _ASM_IA64_SN_IOCONFIG_BUS_H */ diff -Nru a/include/asm-ia64/sn/ioerror.h b/include/asm-ia64/sn/ioerror.h --- a/include/asm-ia64/sn/ioerror.h Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/ioerror.h Mon Nov 24 12:47:33 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. @@ -185,10 +184,10 @@ typedef int error_handler_f(void *, int, ioerror_mode_t, ioerror_t *); typedef void *error_handler_arg_t; -extern void ioerror_dump(char *, int, int, ioerror_t *); +extern void snia_ioerror_dump(char *, int, int, ioerror_t *); #ifdef ERROR_DEBUG -#define IOERROR_DUMP(x, y, z, t) ioerror_dump((x), (y), (z), (t)) +#define IOERROR_DUMP(x, y, z, t) snia_ioerror_dump((x), (y), (z), (t)) #define IOERR_PRINTF(x) (x) #else #define IOERROR_DUMP(x, y, z, t) 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 Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/ksys/elsc.h Mon Nov 24 12:47:33 2003 @@ -1,13 +1,12 @@ -/* $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_SN_KSYS_ELSC_H -#define _ASM_SN_KSYS_ELSC_H +#ifndef _ASM_IA64_SN_KSYS_ELSC_H +#define _ASM_IA64_SN_KSYS_ELSC_H /* * Error codes @@ -37,4 +36,4 @@ #define ELSC_ERROR_NVMAGIC (-124) /* Bad magic no. in NVRAM */ #define ELSC_ERROR_MODULE (-125) /* Moduleid processing err */ -#endif /* _ASM_SN_KSYS_ELSC_H */ +#endif /* _ASM_IA64_SN_KSYS_ELSC_H */ diff -Nru a/include/asm-ia64/sn/labelcl.h b/include/asm-ia64/sn/labelcl.h --- a/include/asm-ia64/sn/labelcl.h Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/labelcl.h Mon Nov 24 12:47:33 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. @@ -13,19 +12,6 @@ #define LABEL_LENGTH_MAX 256 /* Includes NULL char */ #define INFO_DESC_PRIVATE (-1) /* default */ #define INFO_DESC_EXPORT 0 /* export info itself */ - -/* - * Internal Error codes. - */ -typedef enum labelcl_error_e { LABELCL_SUCCESS, /* 0 */ - LABELCL_DUP, /* 1 */ - LABELCL_NOT_FOUND, /* 2 */ - LABELCL_BAD_PARAM, /* 3 */ - LABELCL_HIT_LIMIT, /* 4 */ - LABELCL_CANNOT_ALLOC, /* 5 */ - LABELCL_ILLEGAL_REQUEST, /* 6 */ - LABELCL_IN_USE /* 7 */ - } labelcl_error_t; /* 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 Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/pci/pci_bus_cvlink.h Mon Nov 24 12:47:33 2003 @@ -1,13 +1,12 @@ -/* $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_SN_PCI_CVLINK_H -#define _ASM_SN_PCI_CVLINK_H +#ifndef _ASM_IA64_SN_PCI_CVLINK_H +#define _ASM_IA64_SN_PCI_CVLINK_H #include #include @@ -18,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -56,8 +54,6 @@ vertex_hdl_t vhdl; int isa64; int isPIC; - volatile unsigned int *dma_buf_sync; - volatile unsigned int *xbow_buf_sync; }; struct ioports_to_tlbs_s { @@ -74,4 +70,4 @@ ig:11; }; -#endif /* _ASM_SN_PCI_CVLINK_H */ +#endif /* _ASM_IA64_SN_PCI_CVLINK_H */ diff -Nru a/include/asm-ia64/sn/pio.h b/include/asm-ia64/sn/pio.h --- a/include/asm-ia64/sn/pio.h Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/pio.h Mon Nov 24 12:47:33 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 Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/prio.h Mon Nov 24 12:47:33 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 Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/router.h Mon Nov 24 12:47:33 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 Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/slotnum.h Mon Nov 24 12:47:33 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/geo.h b/include/asm-ia64/sn/sn2/geo.h --- a/include/asm-ia64/sn/sn2/geo.h Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/sn2/geo.h Mon Nov 24 12:47:33 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. @@ -7,8 +6,8 @@ * Copyright (C) 1992 - 1997, 2000-2003 Silicon Graphics, Inc. All rights reserved. */ -#ifndef __SYS_SN_SN2_GEO_H__ -#define __SYS_SN_SN2_GEO_H__ +#ifndef _ASM_IA64_SN_SN2_GEO_H +#define _ASM_IA64_SN_SN2_GEO_H /* Headers required by declarations in this file */ @@ -106,4 +105,4 @@ #define GEO_INVALID_STR "" -#endif /* __SYS_SN_SN2_GEO_H__ */ +#endif /* _ASM_IA64_SN_SN2_GEO_H */ diff -Nru a/include/asm-ia64/sn/sn2/shub.h b/include/asm-ia64/sn/sn2/shub.h --- a/include/asm-ia64/sn/sn2/shub.h Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/sn2/shub.h Mon Nov 24 12:47:33 2003 @@ -1,5 +1,4 @@ /* - * * 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/shub_md.h b/include/asm-ia64/sn/sn2/shub_md.h --- a/include/asm-ia64/sn/sn2/shub_md.h Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/sn2/shub_md.h Mon Nov 24 12:47:33 2003 @@ -1,5 +1,4 @@ /* - * * 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. @@ -8,8 +7,8 @@ */ -#ifndef _SHUB_MD_H -#define _SHUB_MD_H +#ifndef _ASM_IA64_SN_SN2_SHUB_MD_H +#define _ASM_IA64_SN_SN2_SHUB_MD_H /* SN2 supports a mostly-flat address space with 4 CPU-visible, evenly spaced, contiguous regions, or "software banks". On SN2, software bank n begins at @@ -273,4 +272,4 @@ #define MD_BIST_MISCOMPARE(_n) (REMOTE_HUB_L(_n, SH_MMRBIST_ERR) & \ SH_MMRBIST_ERR_DETECTED_MASK) -#endif /* _SHUB_MD_H */ +#endif /* _ASM_IA64_SN_SN2_SHUB_MD_H */ diff -Nru a/include/asm-ia64/sn/sn2/shub_mmr_t.h b/include/asm-ia64/sn/sn2/shub_mmr_t.h --- a/include/asm-ia64/sn/sn2/shub_mmr_t.h Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/sn2/shub_mmr_t.h Mon Nov 24 12:47:33 2003 @@ -1,5 +1,4 @@ /* - * * 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 Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/sn_fru.h Mon Nov 24 12:47:33 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 Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/sn_private.h Mon Nov 24 12:47:33 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 Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/vector.h Mon Nov 24 12:47:33 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 Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/xtalk/xswitch.h Mon Nov 24 12:47:33 2003 @@ -1,13 +1,12 @@ -/* $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_SN_XTALK_XSWITCH_H -#define _ASM_SN_XTALK_XSWITCH_H +#ifndef _ASM_IA64_SN_XTALK_XSWITCH_H +#define _ASM_IA64_SN_XTALK_XSWITCH_H /* * xswitch.h - controls the format of the data @@ -54,4 +53,4 @@ #endif /* __ASSEMBLY__ */ -#endif /* _ASM_SN_XTALK_XSWITCH_H */ +#endif /* _ASM_IA64_SN_XTALK_XSWITCH_H */ 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 Mon Nov 24 12:47:33 2003 +++ b/include/asm-ia64/sn/xtalk/xtalkaddrs.h Mon Nov 24 12:47:33 2003 @@ -1,13 +1,12 @@ -/* $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_SN_XTALK_XTALKADDRS_H -#define _ASM_SN_XTALK_XTALKADDRS_H +#ifndef _ASM_IA64_SN_XTALK_XTALKADDRS_H +#define _ASM_IA64_SN_XTALK_XTALKADDRS_H /* @@ -104,4 +103,4 @@ (widgetreg_t)(*(volatile uint32_t *)(NODE_SWIN_BASE(nasid, widget) + WIDGET_ID)) -#endif /* _ASM_SN_XTALK_XTALKADDRS_H */ +#endif /* _ASM_IA64_SN_XTALK_XTALKADDRS_H */