summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-01-18 18:48:32 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2004-01-18 18:48:32 -0800
commite547722de1ddf32589c1101cb022362cfd1a2cdc (patch)
treea71488617a72ae5a187b7b683d2b490151ac85e1 /include
parenta7e6ebde077bd380d8e6a8dcc35033e011217422 (diff)
[PATCH] sn: Remove __ASSEMBLY__ tags from shubio.h
From: Pat Gefre <pfg@sgi.com> Remove __ASSEMBLY__ tags from shubio.h
Diffstat (limited to 'include')
-rw-r--r--include/asm-ia64/sn/sn2/shubio.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-ia64/sn/sn2/shubio.h b/include/asm-ia64/sn/sn2/shubio.h
index 06897f033df4..37a3b223988a 100644
--- a/include/asm-ia64/sn/sn2/shubio.h
+++ b/include/asm-ia64/sn/sn2/shubio.h
@@ -219,8 +219,6 @@
#define IIO_IPPR 0x00430008 /* IO Performance Profiling */
-#ifndef __ASSEMBLY__
-
/************************************************************************
* *
* Description: This register echoes some information from the *
@@ -2844,8 +2842,6 @@ typedef union ii_ippr_u {
} ii_ippr_u_t;
-#endif /* __ASSEMBLY__ */
-
/**************************************************************************
* *
* The following defines which were not formed into structures are *
@@ -3389,7 +3385,6 @@ typedef ii_icrb0_e_u_t icrbe_t;
#define IO_PERF_SETS 32
#if __KERNEL__
-#ifndef __ASSEMBLY__
#include <asm/sn/alenlist.h>
#include <asm/sn/dmamap.h>
#include <asm/sn/driver.h>
@@ -3625,9 +3620,6 @@ extern int hub_widget_flags_set(nasid_t nasid,
extern int hub_ioerror_handler(vertex_hdl_t, int, int, struct io_error_s *);
extern int kl_ioerror_handler(cnodeid_t, cnodeid_t, cpuid_t,
int, paddr_t, caddr_t, ioerror_mode_t);
-extern int hub_error_devenable(vertex_hdl_t, int, int);
-
-#endif /* __ASSEMBLY__ */
#endif /* _KERNEL */
#endif /* _ASM_IA64_SN_SN2_SHUBIO_H */