CVS Update@linux-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 04/12/27 04:29:35

Modified files:
        include/asm-mips/sn/sn0: hubio.h 

Log message:
        a_addr is causing a namespace colission in skfp.  It's unused otherwise,
        so #if 0 for now.

diff -urN linux/include/asm-mips/sn/sn0/hubio.h 
linux/include/asm-mips/sn/sn0/hubio.h
--- linux/include/asm-mips/sn/sn0/hubio.h       2003/07/29 03:21:48     1.1
+++ linux/include/asm-mips/sn/sn0/hubio.h       2004/12/27 04:29:35     1.2
@@ -486,6 +486,7 @@
 #define ICRBN_A_CERR_SHFT      54
 #define ICRBN_A_ERR_MASK       0x3ff
 
+#if 0  /* Disabled, this causes namespace polution and break allmodconfig */
 /*
  * Easy access macros.
  */
@@ -499,6 +500,7 @@
 #define        a_addr          icrba_fields_s.addr
 #define        a_valid         icrba_fields_s.valid
 #define        a_iow           icrba_fields_s.iow
+#endif
 
 #endif /* !__ASSEMBLY__ */