From: Pat Gefre <pfg@sgi.com>
Remove __ASSEMBLY__ tags from shubio.h
---
25-akpm/include/asm-ia64/sn/sn2/shubio.h | 8 --------
1 files changed, 8 deletions(-)
diff -puN include/asm-ia64/sn/sn2/shubio.h~sn33 include/asm-ia64/sn/sn2/shubio.h
--- 25/include/asm-ia64/sn/sn2/shubio.h~sn33 Thu Jan 8 15:25:06 2004
+++ 25-akpm/include/asm-ia64/sn/sn2/shubio.h Thu Jan 8 15:25:06 2004
@@ -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(nas
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 */
_