diff options
author | Jesse Barnes <jbarnes@sgi.com> | 2003-05-15 21:51:34 -0700 |
---|---|---|
committer | David Mosberger <davidm@tiger.hpl.hp.com> | 2003-05-15 21:51:34 -0700 |
commit | c6bacd5010ec2db31aebbac71bc93540f40d2a9d (patch) | |
tree | 2ae09c178c75803efdac306845070c3aa0d41968 /include/asm-ia64/sn/arch.h | |
parent | f23ed56da68f6f611de827bbd8838d3ffce3b468 (diff) | |
download | history-c6bacd5010ec2db31aebbac71bc93540f40d2a9d.tar.gz |
[PATCH] ia64: SGI SN update
Diffstat (limited to 'include/asm-ia64/sn/arch.h')
-rw-r--r-- | include/asm-ia64/sn/arch.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/include/asm-ia64/sn/arch.h b/include/asm-ia64/sn/arch.h index 85fadf519f9973..a22d12db3e9abd 100644 --- a/include/asm-ia64/sn/arch.h +++ b/include/asm-ia64/sn/arch.h @@ -6,7 +6,7 @@ * * SGI specific setup. * - * Copyright (C) 1995-1997,1999,2001-2002 Silicon Graphics, Inc. All rights reserved. + * Copyright (C) 1995-1997,1999,2001-2003 Silicon Graphics, Inc. All rights reserved. * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org) */ #ifndef _ASM_IA64_SN_ARCH_H @@ -17,23 +17,12 @@ #include <linux/mmzone.h> #include <asm/sn/types.h> -#if defined(CONFIG_IA64_SGI_SN1) -#include <asm/sn/sn1/arch.h> -#elif defined(CONFIG_IA64_SGI_SN2) #include <asm/sn/sn2/arch.h> -#endif - -#if defined(CONFIG_IA64_SGI_SN1) -typedef u64 bdrkreg_t; -#elif defined(CONFIG_IA64_SGI_SN2) typedef u64 shubreg_t; -#endif - typedef u64 hubreg_t; typedef u64 mmr_t; typedef u64 nic_t; -typedef char cnodeid_t; #define CNODE_TO_CPU_BASE(_cnode) (NODEPDA(_cnode)->node_first_cpu) |