summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/ross.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-04-29 21:13:14 +0000
committer <ralf@linux-mips.org>1997-04-29 21:13:14 +0000
commit19c9bba94152148523ba0f7ef7cffe3d45656b11 (patch)
tree40b1cb534496a7f1ca0f5c314a523c69f1fee464 /include/asm-sparc/ross.h
parent7206675c40394c78a90e74812bbdbf8cf3cca1be (diff)
Import of Linux/MIPS 2.1.36
Diffstat (limited to 'include/asm-sparc/ross.h')
-rw-r--r--include/asm-sparc/ross.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-sparc/ross.h b/include/asm-sparc/ross.h
index e6b0ddc26..7b270883f 100644
--- a/include/asm-sparc/ross.h
+++ b/include/asm-sparc/ross.h
@@ -1,4 +1,4 @@
-/* $Id: ross.h,v 1.11 1996/08/29 09:48:40 davem Exp $
+/* $Id: ross.h,v 1.12 1997/03/10 09:16:57 davem Exp $
* ross.h: Ross module specific definitions and defines.
*
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -93,6 +93,8 @@
#define HYPERSPARC_ICCR_FTD 0x00000002
#define HYPERSPARC_ICCR_ICE 0x00000001
+#ifndef __ASSEMBLY__
+
extern __inline__ unsigned int get_ross_icr(void)
{
unsigned int icreg;
@@ -171,4 +173,6 @@ extern __inline__ void hyper_flush_cache_page(unsigned long page)
}
}
+#endif /* !(__ASSEMBLY__) */
+
#endif /* !(_SPARC_ROSS_H) */